PATCH: more specific autoload completion

PATCH: more specific autoload completion

[Peter Stephenson]

This excludes from autoload completion all functions already loaded
or already marked for autoload, on which "autoload" has no effect.

Index: Completion/Zsh/Command/_typeset
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Zsh/Command/_typeset,v
retrieving revision 1.3
diff -u -r1.3 _typeset
--- Completion/Zsh/Command/_typeset	20 Apr 2004 12:11:16 -0000	1.3
+++ Completion/Zsh/Command/_typeset	6 Nov 2006 17:10:47 -0000
@@ -63,7 +63,7 @@
 
 [[ -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 (( $+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

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php