From cfebfe68b58383886f4365899a78135136b3506d Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Sun, 15 May 2011 00:06:31 +0000 Subject: 29278: Completion/Unix/Type/_path_files: fix use of the $skips --- ChangeLog | 7 ++++++- Completion/Unix/Type/_path_files | 2 +- 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 + + * 29278: Completion/Unix/Type/_path_files: fix use of the $skips + pattern from the squeeze-slashes style. + 2011-05-14 Mikael Magnusson * 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}" -- cgit 1.4.1