From b1d9e5d5faada13e2f2f53b32872f0e85aaee6e9 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Mon, 6 Nov 2006 17:14:59 +0000
Subject: 22972: limit autoload completion to functions not yet registered.

---
 Completion/Zsh/Command/_typeset | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Completion/Zsh/Command/_typeset')

diff --git a/Completion/Zsh/Command/_typeset b/Completion/Zsh/Command/_typeset
index 587ce03f9..9c9165563 100644
--- a/Completion/Zsh/Command/_typeset
+++ b/Completion/Zsh/Command/_typeset
@@ -63,7 +63,7 @@ esac
 
 [[ -z "${words[(r)-*[aA]*]}" ]] || func=p
 [[ -z "${words[(r)-*f*]}" ]] || func=f
-   
+
 for ((i=1;i<=$#use;++i)); do
   args+=( ${allargs[${use[$i]}${${(s::)use[$i]}[(r)[Uut]]:+$func}]} )
 done
@@ -75,7 +75,10 @@ if [[ "$state" = vars_eq ]]; then
     if (( $+opt_args[-w] ));then
       _wanted files expl 'zwc file' _files -g '*.zwc(-.)'
     elif [[ $service = autoload || -n $opt_args[(i)-[uU]] ]]; then
-      _wanted functions expl 'shell function' compadd - ${^fpath}/*(:t)
+      args=(${^fpath}/*(:t))
+      # Filter out functions already loaded or marked for autoload.
+      args=(${args:#(${(kj.|.)~functions})})
+      _wanted functions expl 'shell function' compadd -a args
     else
       _functions
     fi
-- 
cgit 1.4.1