summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Zsh/Command/_cd2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b74faefc..42264e045 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-12-28  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 32190 (cf. Alexey Bezhan: 32189): Completion/Zsh/Command/_cd:
+	quote _path_files -W path in case of spaces or special characters
+	when completing relative to ../
+
 	* 32186: Completion/Base/Completer/_expand: fix bad backreference;
 	handle glob patterns that include backslashed quote characters
 
diff --git a/Completion/Zsh/Command/_cd b/Completion/Zsh/Command/_cd
index a5d328fc5..b9860ffc8 100644
--- a/Completion/Zsh/Command/_cd
+++ b/Completion/Zsh/Command/_cd
@@ -100,7 +100,7 @@ else
     # already handled by _command_names (see _autocd)
 
     [[ CURRENT -ne 1 || ( -z "$path[(r).]" && $PREFIX != */* ) ]] &&
-        alt=( "${cdpath+local-}directories:${cdpath+local }directory:_path_files $tmpWpath -/" "$alt[@]" )
+        alt=( "${cdpath+local-}directories:${cdpath+local }directory:_path_files ${(j: :)${(@q)tmpWpath}} -/" "$alt[@]" )
 
     if [[ CURRENT -eq argstart && noopts -eq 0 && $PREFIX = -* ]] &&
       zstyle -t ":completion:${curcontext}:options" complete-options; then