1
0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00

22972: limit autoload completion to functions not yet registered.

This commit is contained in:
Peter Stephenson 2006-11-06 17:14:59 +00:00
parent da0dfc62df
commit b1d9e5d5fa
2 changed files with 8 additions and 2 deletions

@ -1,5 +1,8 @@
2006-11-06 Peter Stephenson <pws@csr.com>
* 22972: Completion/Zsh/Command/_typeset: autoload completion
is limited to functions not yet registered.
* 22971: Src/exec.c, Src/jobs.c: don't allow job control
on jobs in current shell and sanitize error message used.

@ -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