summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2009-01-29 17:58:30 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2009-01-29 17:58:30 +0000
commitc53972be2626a1754becccf9246d7a2e88f008af (patch)
tree9e3d14868befbc2ba11463e347837a02488eaf4c
parent0b9e0fc3c5231a7c494f2de8a98712b38d0cf037 (diff)
downloadzsh-c53972be2626a1754becccf9246d7a2e88f008af.tar.gz
zsh-c53972be2626a1754becccf9246d7a2e88f008af.tar.xz
zsh-c53972be2626a1754becccf9246d7a2e88f008af.zip
26485: _path_files with accept-exact-dirs could get path order wrong
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Type/_path_files4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8212e8121..78d5697f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-29  Peter Stephenson  <pws@csr.com>
+
+	* 26485: Completion/Unix/Type/_path_files: accept-exact-dirs could
+	rearrange directories into the wrong order.
+
 2009-01-29  Clint Adams  <clint@zsh.org>
 
 	* 26482: Completion/Unix/Command/_patch: complete patch -U,
@@ -11052,5 +11057,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4539 $                         
+* $Revision: 1.4540 $                         
 *****************************************************
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index 2e9e943b5..71969d37b 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -578,11 +578,11 @@ for prepath in "$prepaths[@]"; do
 
     if [[ "$tpre" = */* ]]; then
       tmp2="${cpre}${tpre%%/*}"
-      PREFIX="${donepath}${linepath}${tmp2}"
+      PREFIX="${linepath}${donepath}${tmp2}"
       SUFFIX="/${tpre#*/}${tsuf#*/}"
     else
       tmp2="${cpre}${tpre}"
-      PREFIX="${donepath}${linepath}${tmp2}"
+      PREFIX="${linepath}${donepath}${tmp2}"
       SUFFIX="${tsuf}"
     fi