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

Functions/Calendar/age

@@ -31,7 +31,7 @@ emulate -L zsh
 zmodload -F zsh/stat b:zstat
 zmodload -i zsh/parameter
 
-autoload -U calendar_scandate
+autoload -Uz calendar_scandate
 
 local -a vals tmp
 

Functions/Calendar/calendar

@@ -13,7 +13,7 @@ local -A reply
 zmodload -i zsh/datetime || return 1
 zmodload -i zsh/zutil || return 1
 
-autoload -U calendar_{add,parse,read,scandate,show,lockfiles}
+autoload -Uz calendar_{add,parse,read,scandate,show,lockfiles}
 
 # Read the calendar file from the calendar-file style
 zstyle -s ':datetime:calendar:' calendar-file calendar || calendar=~/calendar

Functions/Calendar/calendar_add

@@ -21,7 +21,7 @@ local -A reply parse_new parse_old
 local -a match mbegin mend
 local my_uid their_uid
 
-autoload -U calendar_{parse,read,lockfiles}
+autoload -Uz calendar_{parse,read,lockfiles}
 
 while getopts "BL" opt; do
   case $opt in

Functions/Calendar/calendar_parse

@@ -40,7 +40,7 @@ integer now then replaced firstsched schedrpt
 # may occur multiple times.  We set occurrences[<timestamp>]=disposition.
 local -A occurrences
 
-autoload -U calendar_scandate
+autoload -Uz calendar_scandate
 
 typeset -gA reply
 

Functions/Calendar/calendar_sort

@@ -1,7 +1,7 @@
 emulate -L zsh
 setopt extendedglob
 
-autoload -U calendar_{read,scandate,lockfiles}
+autoload -Uz calendar_{read,scandate,lockfiles}
 
 local calendar line REPLY new lockfile
 local -a calendar_entries

Functions/MIME/zsh-mime-setup

@@ -3,7 +3,7 @@ setopt extendedglob cbases
 
 local opt o_verbose o_list
 
-autoload -U zsh-mime-handler
+autoload -Uz zsh-mime-handler
 
 while getopts "flv" opt; do
   case $opt in

Functions/Misc/sticky-note

@@ -44,7 +44,7 @@ then
   return 0
 fi
 
-(($+bg && $+fg)) || { autoload -U colors; colors }
+(($+bg && $+fg)) || { autoload -Uz colors; colors }
 
 # Invoked as a command, behave like zed, but write a history file
 setopt nobanghist extendedhistory histignoredups

Functions/Misc/zcalc

@@ -105,7 +105,7 @@ history -ap "${ZDOTDIR:-$HOME}/.zcalc_history"
 forms=( '%2$g' '%.*g' '%.*f' '%.*E' '')
 
 zmodload -i zsh/mathfunc 2>/dev/null
-autoload -U zmathfuncdef
+autoload -Uz zmathfuncdef
 
 : ${ZCALCPROMPT="%1v> "}
 

Functions/Prompts/promptinit

@@ -32,7 +32,7 @@ promptinit () {
   done
 
   # To manipulate precmd and preexec hooks...
-  autoload -U add-zsh-hook
+  autoload -Uz add-zsh-hook
 
   # Variables common to all prompt styles
   prompt_newline=$'\n%{\r%}'
@@ -134,7 +134,7 @@ Use prompt -h <theme> for help on specific themes.'
        ;;
     s) print "Set and save not yet implemented.  Please ensure your ~/.zshrc"
        print "contains something similar to the following:\n"
-       print "  autoload -U promptinit"
+       print "  autoload -Uz promptinit"
        print "  promptinit"
        print "  prompt $*[2,-1]"
        shift

Functions/Zle/delete-whole-word-match

@@ -16,7 +16,7 @@ local -a matched_words
 # Start and end of range of characters to remove.
 integer pos1 pos2
 
-autoload -U match-words-by-style
+autoload -Uz match-words-by-style
 match-words-by-style
 
 if [[ -n "${matched_words[3]}" ]]; then

Functions/Zle/edit-command-line

@@ -1,6 +1,6 @@
 # Edit the command line using your usual editor.
 # Binding this to 'v' in the vi command mode map,
-#   autoload -z edit-command-line
+#   autoload -Uz edit-command-line
 #   zle -N edit-command-line
 #   bindkey -M vicmd v edit-command-line
 # will give ksh-like behaviour for that key,

Functions/Zle/replace-string

@@ -1,7 +1,7 @@
 emulate -L zsh
 setopt extendedglob
 
-autoload -U read-from-minibuffer replace-string-again
+autoload -Uz read-from-minibuffer replace-string-again
 
 local p1="Replace: " p2="   with: "
 # Saving curwidget is necessary to avoid the widget name being overwritten.

Functions/Zle/replace-string-again

@@ -39,7 +39,7 @@ if [[ $curwidget = *(pattern|regex)* ]]; then
     done
     rep2+=$rep
     if [[ $curwidget = *regex* ]]; then
-      autoload -U regexp-replace
+      autoload -Uz regexp-replace
       regexp-replace LBUFFER $_replace_string_src $rep2
       regexp-replace RBUFFER $_replace_string_src $rep2
     else