From 51cb3f0a27ea185be2d703be822b2b4b23eba0b7 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Wed, 3 Nov 1999 09:06:17 +0000
Subject: zsh-3.1.6-bart-8

---
 Completion/Base/.distfiles     | 5 +++--
 Completion/Builtins/.distfiles | 2 +-
 Completion/Builtins/_popd      | 9 +++++----
 Completion/User/_man           | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'Completion')

diff --git a/Completion/Base/.distfiles b/Completion/Base/.distfiles
index d1118abaa..0743367c7 100644
--- a/Completion/Base/.distfiles
+++ b/Completion/Base/.distfiles
@@ -1,6 +1,7 @@
 DISTFILES_SRC='
     .distfiles 
     _arg_compile _arguments _brace_parameter _combination _command_names
-    _condition _default _describe _equal _first _math _parameter
-    _precommand _redirect _regex_arguments _subscript _tilde _values _vars
+    _condition _default _describe _equal _first _job _math _parameter
+    _precommand _redirect _regex_arguments _subscript _tilde _value
+    _values _vars
 '
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
diff --git a/Completion/User/_man b/Completion/User/_man
index 50445edf6..60bd23dd7 100644
--- a/Completion/User/_man
+++ b/Completion/User/_man
@@ -21,7 +21,7 @@ if (( ! $#manpath )); then
   manpath=( $mp )
 fi
 
-(( $#manpath )) ||
+(( $#manpath )) || manpath=( ${(s.:.)$(manpath 2>/dev/null)} ) ||
   manpath=( /usr/man(-/N) /(opt|usr)/(dt|share|X11R6|local)/(cat|)man(-/N) )
 
 # `sman' is the SGML manual directory for Solaris 7.
-- 
cgit 1.4.1