summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Type/_path_files17
2 files changed, 12 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index b6cf2888e..51baa9424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-03 Oliver Kiddle <opk@zsh.org>
+
+ * 17072; based on 17066 (Danek Duvall):
+ Completion/Unix/Type/_path_files: correct handling of pushdminus
+ in completion after directory stack references
+
2002-04-30 Clint Adams <clint@zsh.org>
* 17057: Completion/Debian/Command/.distfiles,
diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files
index aa9d87df1..df820c643 100644
--- a/Completion/Unix/Type/_path_files
+++ b/Completion/Unix/Type/_path_files
@@ -224,20 +224,15 @@ elif [[ "$pre[1]" = \~ && -z "$compstate[quote]" ]]; then
realpath="${HOME%/}/"
elif [[ "$linepath" = ([-+]|)[0-9]## ]]; then
if [[ "$linepath" != [-+]* ]]; then
- if [[ -o pushdminus ]]; then
- tmp1="-$linepath"
- else
- tmp1="+$linepath"
- fi
- else
tmp1="$linepath"
- fi
- if [[ "$linepath" = -* ]]; then
- tmp1=$(( $#dirstack $tmp1 ))
else
- tmp1=$tmp1[2,-1]
+ if [[ "$linepath" = -* ]]; then
+ tmp1=$(( $#dirstack $linepath ))
+ else
+ tmp1=$linepath[2,-1]
+ fi
+ [[ -o pushdminus ]] && tmp1=$(( $#dirstack - $tmp1 ))
fi
- [[ -o pushdminus ]] && tmp1=$(( $#dirstack - $tmp1 ))
if (( ! tmp1 )); then
realpath=$PWD/
elif [[ tmp1 -le $#dirstack ]]; then