From a2159285e80508bb682d90a71270fbddada8bd05 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Fri, 18 Jun 1999 10:55:45 +0000
Subject: zsh-3.1.5-pws-22

---
 Completion/Core/_normal     | 2 +-
 Completion/Core/_path_files | 4 ++--
 Completion/Core/compdump    | 2 +-
 Completion/Core/compinit    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'Completion/Core')

diff --git a/Completion/Core/_normal b/Completion/Core/_normal
index ed7243bb1..ba7f2123f 100644
--- a/Completion/Core/_normal
+++ b/Completion/Core/_normal
@@ -20,7 +20,7 @@ elif [[ "$command" == */* ]]; then
   cmd2="${command:t}"
 else
   cmd1="$command"
-  eval cmd2=$(whence -p $command)
+  cmd2=$(whence -p $command)
 fi
 
 # See if there are any matching pattern completions.
diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files
index 332aba017..d0d1c6a0a 100644
--- a/Completion/Core/_path_files
+++ b/Completion/Core/_path_files
@@ -231,7 +231,7 @@ for prepath in "$prepaths[@]"; do
       # See which of them match what's on the line.
 
       tmp2=("$tmp1[@]")
-      compadd -D tmp1 "$ignore[@]" - "${(@)tmp1##*/}"
+      compadd -D tmp1 "$ignore[@]" - "${(@)tmp1:t}"
 
       # If no file matches, save the expanded path and continue with
       # the outer loop.
@@ -240,7 +240,7 @@ for prepath in "$prepaths[@]"; do
  	if [[ "$tmp2[1]" = */* ]]; then
 	  tmp2=( "${(@)tmp2#${prepath}${realpath}}" )
 	  if [[ "$tmp2[1]" = */* ]]; then
-	    exppaths=( "$exppaths[@]" ${^tmp2%/*}/${tpre}${tsuf} )
+	    exppaths=( "$exppaths[@]" ${^tmp2:h}/${tpre}${tsuf} )
           else
 	    exppaths=( "$exppaths[@]" ${tpre}${tsuf} )
 	  fi
diff --git a/Completion/Core/compdump b/Completion/Core/compdump
index 8288ccdd4..5ee04e028 100644
--- a/Completion/Core/compdump
+++ b/Completion/Core/compdump
@@ -74,7 +74,7 @@ done))
 # print them out:  about five to a line looks neat
 
 while (( $#_d_als )); do
-  print -n autoload
+  print -n autoload -U
   for (( _i = 0; _i < 5; _i++ )); do
     if (( $#_d_als )); then
       print -n " $_d_als[1]"
diff --git a/Completion/Core/compinit b/Completion/Core/compinit
index af2467bec..23bc94cf9 100644
--- a/Completion/Core/compinit
+++ b/Completion/Core/compinit
@@ -194,7 +194,7 @@ compdef() {
     # and probably do autoloading.
 
     func="$1"
-    [[ -n "$autol" ]] && autoload "$func"
+    [[ -n "$autol" ]] && autoload -U "$func"
     shift
 
     case "$type" in
@@ -363,7 +363,7 @@ if [[ -z "$_i_done" ]]; then
 	fi
 	;;
       (\#autoload)
-	autoload ${_i_file:t}
+	autoload -U ${_i_file:t}
 	;;
       esac
     done
-- 
cgit 1.4.1