summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2009-08-05 00:28:34 +0000
committerClint Adams <clint@users.sourceforge.net>2009-08-05 00:28:34 +0000
commit805a11bddf4298b31c6bb2d70e4ea33674a6be16 (patch)
tree8f37492508b1ffbf4f57386e6ff48596b22fa2e8
parentab4cfaeddac904e14712ce72f4b929b867c9d411 (diff)
downloadzsh-805a11bddf4298b31c6bb2d70e4ea33674a6be16.tar.gz
zsh-805a11bddf4298b31c6bb2d70e4ea33674a6be16.tar.xz
zsh-805a11bddf4298b31c6bb2d70e4ea33674a6be16.zip
27208: try to do the right thing when applying file-sort to extant glob qualifiers.
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Type/_path_files2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5764ddaa5..bd407390a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-05  Clint Adams  <clint@zsh.org>
+
+	* 27208: Completion/Unix/Type_path_files: try to do the
+	right thing when applying file-sort to extant glob qualifiers.
+
 2009-08-01  Clint Adams  <clint@zsh.org>
 
 	* 27203: Completion/Debian/Command/_aptitude: treat
@@ -12048,5 +12053,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4753 $
+* $Revision: 1.4754 $
 *****************************************************
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index 63713eff7..ab6684da8 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -160,7 +160,7 @@ if zstyle -s ":completion:${curcontext}:" file-sort tmp1; then
       if _have_glob_qual "$tmp1" complete; then
 	# unbalanced parenthesis is correct: match[1] contains the start,
 	# match[5] doesn't contain the end.
-	tmp2+=( "${match[1]}${sort}${match[5]})" )
+	tmp2+=( "${match[1]}${match[5]})(${sort})" )
       else
         tmp2+=( "${tmp1}(${sort})" )
       fi