c.f. users/15202: use "autoload -Uz" consistently

16 files changed, 37 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index fa3be755e..b5c127448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-28  Peter Stephenson  <pws@csr.com>
+
+	* as described in users/15202: Functions/Misc/run-help,
+	Functions/Newuser/zsh-newuser-install,
+	Functions/Prompts/promptinit, Functions/TCP/tcp_open,
+	Functions/Zftp/zfinit, Functions/Zle/down-case-word-match,
+	Functions/Zle/forward-word-match,
+	Functions/Zle/history-pattern-search,
+	Functions/Zle/insert-composed-char, Functions/Zle/kill-word-match,
+	Functions/Zle/match-words-by-style,
+	Functions/Zle/select-word-style,
+	Functions/Zle/transpose-words-match,
+	Functions/Zle/up-case-word-match, Functions/Zle/zed-set-file-name:
+	Use "autoload -Uz" consistently throughout distributed functions.
+
 2010-07-26  Peter Stephenson  <pws@csr.com>
 
 	* 28102: Src/Zle/computil.c: use lstat() when checking
@@ -13423,5 +13438,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5036 $
+* $Revision: 1.5037 $
 *****************************************************
diff --git a/Functions/Misc/run-help b/Functions/Misc/run-help
index 6a1b3a418..6a9abb3cf 100644
--- a/Functions/Misc/run-help
+++ b/Functions/Misc/run-help
@@ -5,7 +5,7 @@
 # Install this function by placing it in your FPATH and then
 # adding to your .zshrc the lines:
 #	unalias run-help
-#	autoload run-help
+#	autoload -Uz run-help
 #
 
 emulate -RL zsh
diff --git a/Functions/Newuser/zsh-newuser-install b/Functions/Newuser/zsh-newuser-install
index 7428c6a49..e9ca82652 100644
--- a/Functions/Newuser/zsh-newuser-install
+++ b/Functions/Newuser/zsh-newuser-install
@@ -1081,7 +1081,7 @@ ${install_state[options]:+  ($install_state[options].)}
     if [[ $1 != -f ]]; then
       print -r "The function will not be run in future, but you can run
 it yourself as follows:
-  autoload $myname
+  autoload -Uz $myname
   $myname -f
 
 The code added to $zdmsg/.zshrc is marked by the lines
diff --git a/Functions/Prompts/promptinit b/Functions/Prompts/promptinit
index fef01d372..98c220fc1 100644
--- a/Functions/Prompts/promptinit
+++ b/Functions/Prompts/promptinit
@@ -22,7 +22,7 @@ promptinit () {
       name="$match[1]"
       if [[ -r "$theme" ]]; then
         prompt_themes=($prompt_themes $name)
-        autoload -U prompt_${name}_setup
+        autoload -Uz prompt_${name}_setup
       else
         print "Couldn't read file $theme containing theme $name."
       fi
diff --git a/Functions/TCP/tcp_open b/Functions/TCP/tcp_open
index 01327dc74..091217788 100644
--- a/Functions/TCP/tcp_open
+++ b/Functions/TCP/tcp_open
@@ -57,9 +57,9 @@ setopt extendedglob cbases
 
 zmodload -i zsh/net/tcp || return 1
 zmodload -i zsh/zutil
-autoload -U tcp_alias tcp_close tcp_command tcp_expect tcp_fd_handler
-autoload -U tcp_log tcp_output tcp_proxy tcp_read tcp_rename tcp_send
-autoload -U tcp_sess tcp_spam tcp_talk tcp_wait tcp_point tcp_shoot
+autoload -Uz tcp_alias tcp_close tcp_command tcp_expect tcp_fd_handler
+autoload -Uz tcp_log tcp_output tcp_proxy tcp_read tcp_rename tcp_send
+autoload -Uz tcp_sess tcp_spam tcp_talk tcp_wait tcp_point tcp_shoot
 
 # TCP_SECONDS_START is only set if we override TCP_SECONDS locally,
 # so provide a global value for convenience.  Should probably always be 0.
diff --git a/Functions/Zftp/zfinit b/Functions/Zftp/zfinit
index 663f1ff44..68e6a9691 100644
--- a/Functions/Zftp/zfinit
+++ b/Functions/Zftp/zfinit
@@ -25,10 +25,10 @@ alias zfls='noglob zfls'
 alias zfdir='noglob zfdir'
 alias zfuget='noglob zfuget'
 
-autoload -U zfanon zfautocheck zfcd zfcd_match zfcget zfclose zfcput
-autoload -U zfdir zffcache zfgcp zfget zfget_match zfgoto zfhere zfinit zfls
-autoload -U zfmark zfopen zfparams zfpcp zfput zfrglob zfrtime zfsession
-autoload -U zfstat zftp_chpwd zftp_progress zftransfer zftype zfuget zfuput
+autoload -Uz zfanon zfautocheck zfcd zfcd_match zfcget zfclose zfcput
+autoload -Uz zfdir zffcache zfgcp zfget zfget_match zfgoto zfhere zfinit zfls
+autoload -Uz zfmark zfopen zfparams zfpcp zfput zfrglob zfrtime zfsession
+autoload -Uz zfstat zftp_chpwd zftp_progress zftransfer zftype zfuget zfuput
 
 #
 # zftp completions: only use these if new-style completion is not
diff --git a/Functions/Zle/down-case-word-match b/Functions/Zle/down-case-word-match
index 87d543f8d..3da9159c9 100644
--- a/Functions/Zle/down-case-word-match
+++ b/Functions/Zle/down-case-word-match
@@ -1,7 +1,7 @@
 emulate -L zsh
 setopt extendedglob
 
-autoload match-words-by-style
+autoload -Uz match-words-by-style
 
 local curcontext=":zle:$WIDGET" word
 local -a matched_words
diff --git a/Functions/Zle/forward-word-match b/Functions/Zle/forward-word-match
index 2a4165c0c..50e18cbde 100644
--- a/Functions/Zle/forward-word-match
+++ b/Functions/Zle/forward-word-match
@@ -1,7 +1,7 @@
 emulate -L zsh
 setopt extendedglob
 
-autoload match-words-by-style
+autoload -Uz match-words-by-style
 
 local curcontext=":zle:$WIDGET" word
 local -a matched_words
diff --git a/Functions/Zle/history-pattern-search b/Functions/Zle/history-pattern-search
index a6b12bd9c..0e3103e19 100644
--- a/Functions/Zle/history-pattern-search
+++ b/Functions/Zle/history-pattern-search
@@ -13,7 +13,7 @@ emulate -L zsh
 setopt extendedglob
 
 # Load required features.
-autoload -U read-from-minibuffer
+autoload -Uz read-from-minibuffer
 zmodload -i zsh/parameter
 
 local REPLY dir new
diff --git a/Functions/Zle/insert-composed-char b/Functions/Zle/insert-composed-char
index b218538f9..c0922e7d4 100644
--- a/Functions/Zle/insert-composed-char
+++ b/Functions/Zle/insert-composed-char
@@ -142,7 +142,7 @@ fi
 if (( ${+zsh_accented_chars} == 0 )); then
   # Save quite a lot of memory by running and then erasing
   # the function that defines the characters.
-  autoload -U define-composed-chars
+  autoload -Uz define-composed-chars
   define-composed-chars
   unfunction define-composed-chars
 fi
diff --git a/Functions/Zle/kill-word-match b/Functions/Zle/kill-word-match
index 5fcaeb86c..30db5ab35 100644
--- a/Functions/Zle/kill-word-match
+++ b/Functions/Zle/kill-word-match
@@ -1,7 +1,7 @@
 emulate -L zsh
 setopt extendedglob
 
-autoload match-words-by-style
+autoload -Uz match-words-by-style
 
 local curcontext=":zle:$WIDGET" word done
 local -a matched_words
diff --git a/Functions/Zle/match-words-by-style b/Functions/Zle/match-words-by-style
index 2cbc35469..69ceba76a 100644
--- a/Functions/Zle/match-words-by-style
+++ b/Functions/Zle/match-words-by-style
@@ -73,7 +73,7 @@ local nwords MATCH MBEGIN MEND subwordrange
 
 local curcontext=${curcontext:-:zle:match-words-by-style}
 
-autoload -U match-word-context
+autoload -Uz match-word-context
 match-word-context
 
 while getopts "w:s:c:C:r:" opt; do
diff --git a/Functions/Zle/select-word-style b/Functions/Zle/select-word-style
index 9c0fdb5cc..95d2e4446 100644
--- a/Functions/Zle/select-word-style
+++ b/Functions/Zle/select-word-style
@@ -8,13 +8,13 @@ word_functions=(backward-kill-word backward-word
     forward-word kill-word
     transpose-words up-case-word)
 
-[[ -z $1 ]] && autoload read-from-minibuffer
+[[ -z $1 ]] && autoload -Uz read-from-minibuffer
 
 local REPLY detail f wordstyle
 
 if ! zle -l $word_functions[1]; then
     for f in $word_functions; do
-	autoload -U $f-match
+	autoload -Uz $f-match
 	zle -N $f $f-match
     done
 fi
diff --git a/Functions/Zle/transpose-words-match b/Functions/Zle/transpose-words-match
index 8885c0b81..c1db310c1 100644
--- a/Functions/Zle/transpose-words-match
+++ b/Functions/Zle/transpose-words-match
@@ -11,7 +11,7 @@
 # on X would be turned into `barXfoo' with the cursor still on the X,
 # regardless of what the character X is.
 
-autoload -z match-words-by-style
+autoload -Uz match-words-by-style
 
 local curcontext=":zle:$WIDGET" skip
 local -a matched_words
diff --git a/Functions/Zle/up-case-word-match b/Functions/Zle/up-case-word-match
index 781290332..a24239525 100644
--- a/Functions/Zle/up-case-word-match
+++ b/Functions/Zle/up-case-word-match
@@ -1,7 +1,7 @@
 emulate -L zsh
 setopt extendedglob
 
-autoload match-words-by-style
+autoload -Uz match-words-by-style
 
 local curcontext=":zle:$WIDGET" word
 local -a matched_words
diff --git a/Functions/Zle/zed-set-file-name b/Functions/Zle/zed-set-file-name
index ca7758c37..da3421e71 100644
--- a/Functions/Zle/zed-set-file-name
+++ b/Functions/Zle/zed-set-file-name
@@ -1,6 +1,6 @@
 emulate -L zsh
 
-autoload -U read-from-minibuffer
+autoload -Uz read-from-minibuffer
 
 zle -K zed-normal-keymap