about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-04-23 21:51:59 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-04-23 21:51:59 +0000
commit32251cbac450fcd2360eea908c2950900b3c48ac (patch)
treec70d05042bf8141ed5742186c51f80b8085f0cb0
parent11440d17d1f49ab62f91d8ed34de5c1e9f79a95b (diff)
downloadzsh-32251cbac450fcd2360eea908c2950900b3c48ac.tar.gz
zsh-32251cbac450fcd2360eea908c2950900b3c48ac.tar.xz
zsh-32251cbac450fcd2360eea908c2950900b3c48ac.zip
users/15028 modified to unquote in one place:
with path-completion false or accept-exact-dirs true we need
to unquote the string before sticking it in the current path
-rw-r--r--ChangeLog9
-rw-r--r--Completion/Unix/Type/_path_files2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 73121da47..b790b381c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/15028 (modified to do the unquoting a bit more
+	logically): Completion/Unix/Type/_path_files: for
+	path-completion false and accept-exact-dirs true we need to
+	unquote the word from the command line.
+
 2010-04-20  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 27889: Src/subst.c, Test/D04parameter.ztst: Force more use of
@@ -13045,5 +13052,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4960 $
+* $Revision: 1.4961 $
 *****************************************************
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index fa02656d0..9445ac77c 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -357,7 +357,7 @@ for prepath in "$prepaths[@]"; do
   cpre=
 
   if [[ ( -n $accept_exact_dirs || -z $path_completion ) && \
-        $pre = (#b)(*)/([^/]#) ]]; then
+        ${(Q)pre} = (#b)(*)/([^/]#) ]]; then
     # We've been told either that we can accept an exact directory prefix
     # immediately, or that path expansion is inhibited.  Try the longest
     # path prefix first: in the first case, this saves stats in the simple