about summary refs log tree commit diff
diff options
context:
space:
mode:
-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 031a6c851..985f2ad54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 29278: Completion/Unix/Type/_path_files: fix use of the $skips
+	pattern from the squeeze-slashes style.
+
 2011-05-14  Mikael Magnusson <mikachu@gmail.com>
 
 	* 29271: Doc/Zsh/compwid.yo: document _alternative -O name.
@@ -14712,5 +14717,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5304 $
+* $Revision: 1.5305 $
 *****************************************************
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index baa57e5d3..1c272baba 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -574,7 +574,7 @@ for prepath in "$prepaths[@]"; do
     # slash be added.
 
     tmp1=( ${tmp1//(#b)([][()|*?^#~<>\\=])/\\${match[1]}} )
-    tmp2="${(M)tpre##((.|..|)/)##}"
+    tmp2="${(M)tpre##${~skips}}"
     if [[ -n "$tmp2" ]]; then
       skipped="/$tmp2"
       tpre="${tpre#$tmp2}"