about summary refs log tree commit diff
path: root/Completion/Builtins
diff options
context:
space:
mode:
authorTanaka Akira <akr@users.sourceforge.net>1999-11-03 09:06:17 +0000
committerTanaka Akira <akr@users.sourceforge.net>1999-11-03 09:06:17 +0000
commit51cb3f0a27ea185be2d703be822b2b4b23eba0b7 (patch)
tree5db1bf8f6c42192fcf99306695b4e9ce715322d6 /Completion/Builtins
parent5a78f7af98401d4974b52b844994e4d783592b16 (diff)
downloadzsh-51cb3f0a27ea185be2d703be822b2b4b23eba0b7.tar.gz
zsh-51cb3f0a27ea185be2d703be822b2b4b23eba0b7.tar.xz
zsh-51cb3f0a27ea185be2d703be822b2b4b23eba0b7.zip
zsh-3.1.6-bart-8 zsh-3.1.6-bart-8
Diffstat (limited to 'Completion/Builtins')
-rw-r--r--Completion/Builtins/.distfiles2
-rw-r--r--Completion/Builtins/_popd9
2 files changed, 6 insertions, 5 deletions
diff --git a/Completion/Builtins/.distfiles b/Completion/Builtins/.distfiles
index 8fc8fcc6b..7af78417a 100644
--- a/Completion/Builtins/.distfiles
+++ b/Completion/Builtins/.distfiles
@@ -2,6 +2,6 @@ DISTFILES_SRC='
     .distfiles
     _aliases _arrays _autoload _bg_jobs _bindkey _builtin _cd _command
     _compdef _disable _echotc _enable _fc _functions _hash _jobs _kill
-    _limits _nothing _sched _set _setopt _source _stat _trap _unhash
+    _limits _nothing _popd _sched _set _setopt _source _stat _trap _unhash
     _unsetopt _vars_eq _wait _which _zftp _zle _zmodload
 '
diff --git a/Completion/Builtins/_popd b/Completion/Builtins/_popd
index 5b18ec228..9054befb7 100644
--- a/Completion/Builtins/_popd
+++ b/Completion/Builtins/_popd
@@ -5,7 +5,8 @@
 # way round if pushdminus is set). Note that this function is also called
 # from _cd for cd and pushd.
 
-setopt localoptions nonomatch
+emulate -L zsh
+setopt extendedglob nonomatch
 
 [[ $PREFIX = [-+]* ]] || return 1
 
@@ -16,17 +17,17 @@ PREFIX=$PREFIX[2,-1]
 
 # get the list of directories with their canonical number
 # and turn the lines into an array, removing the current directory
-lines=( "$dirstack[@]" )
+lines=( ${${(f)"$(dirs -v)"}##0*} )
 if [[ ( $IPREFIX = - && ! -o pushdminus ) ||
       ( $IPREFIX = + && -o pushdminus ) ]]; then
   integer i
   revlines=( $lines )
   for (( i = 1; i <= $#lines; i++ )); do
-    lines[$i]="$((i-1)) -- ${revlines[-$i]}"
+    lines[$i]="$((i-1)) -- ${revlines[-$i]##[0-9]#[	 ]#}"
   done
 else
   for (( i = 1; i <= $#lines; i++ )); do
-    lines[$i]="$i -- ${lines[$i]}"
+    lines[$i]="$i -- ${lines[$i]##[0-9]#[	 ]#}"
   done
 fi
 # get the array of numbers only