diff options
27 files changed, 50 insertions, 28 deletions
@@ -1,3 +1,25 @@ +2008-07-11 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Phil Pennock: 25276: + Completion/Darwin/Type/_retrieve_mac_apps, + Completion/Unix/Command/_baz, Completion/Unix/Command/_darcs, + Completion/Unix/Command/_tar, Completion/Unix/Command/_tla, + Completion/Zsh/Command/_zftp, Functions/Misc/sticky-note, + Functions/Misc/tetris, Functions/Misc/xtermctl, + Functions/Misc/zed, Functions/Prompts/prompt_bigfade_setup, + Functions/Prompts/prompt_elite2_setup, + Functions/Prompts/prompt_elite_setup, + Functions/Prompts/prompt_fade_setup, + Functions/Prompts/prompt_fire_setup, + Functions/Prompts/promptinit, Functions/Zle/edit-command-line, + Functions/Zle/history-beginning-search-menu, + Functions/Zle/incarg, Functions/Zle/modify-current-argument, + Functions/Zle/narrow-to-region-invisible, + Functions/Zle/predict-on, Functions/Zle/quote-and-complete-word, + Functions/Zle/transpose-words-match, + Functions/Zle/url-quote-magic, StartupFiles/zshrc: + use autoload -z to load zsh functions. + 2008-07-07 Peter Stephenson <pws@csr.com> * unposted: Functions/Zle/copy-earlier-word: avoid diff --git a/Completion/Darwin/Type/_retrieve_mac_apps b/Completion/Darwin/Type/_retrieve_mac_apps index c1b05e9f4..f435fde26 100644 --- a/Completion/Darwin/Type/_retrieve_mac_apps +++ b/Completion/Darwin/Type/_retrieve_mac_apps @@ -47,7 +47,7 @@ _mac_apps_old_retrieve () { # Get single file applications if ! zstyle -t ":completion:${curcontext}:commands" ignore-single; then - autoload -U zargs + autoload -Uz zargs local app_cand nargs envvars app_cand=( ${^app_dir}^*.[a-z]#/..namedfork/rsrc(.UrN,.RN^U) ) envvars="$(builtin typeset -x)" diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz index 5015456fb..132c6e31d 100644 --- a/Completion/Unix/Command/_baz +++ b/Completion/Unix/Command/_baz @@ -1,6 +1,6 @@ #compdef baz -autoload is-at-least +autoload -z is-at-least local BAZ=$words[1] local baz_version local hide_short diff --git a/Completion/Unix/Command/_darcs b/Completion/Unix/Command/_darcs index aa4d36770..1d3414e45 100644 --- a/Completion/Unix/Command/_darcs +++ b/Completion/Unix/Command/_darcs @@ -6,7 +6,7 @@ setopt EXTENDED_GLOB local DARCS=$words[1] # test whether to hide short options from completion -autoload is-at-least +autoload -z is-at-least local hide_short if zstyle -s ":completion:${curcontext}" hide-shortopts hide_short; then case $hide_short in diff --git a/Completion/Unix/Command/_tar b/Completion/Unix/Command/_tar index 2958b5957..334605137 100644 --- a/Completion/Unix/Command/_tar +++ b/Completion/Unix/Command/_tar @@ -24,7 +24,7 @@ local _tar_cmd tf tmp tmpb del index if _pick_variant gnu=GNU unix --version; then case "$($service --version)" in (tar \(GNU tar\) (#b)([0-9.-]##)*) - autoload is-at-least + autoload -z is-at-least is-at-least 1.14.91 "$match[1]" || _cmd_variant[$service]="gnu-old" ;; esac diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla index 9c5c5a821..358a6a736 100644 --- a/Completion/Unix/Command/_tla +++ b/Completion/Unix/Command/_tla @@ -1,6 +1,6 @@ #compdef tla -autoload is-at-least +autoload -z is-at-least local TLA=$words[1] local tla_version local hide_short diff --git a/Completion/Zsh/Command/_zftp b/Completion/Zsh/Command/_zftp index 9c1488fc3..105533055 100644 --- a/Completion/Zsh/Command/_zftp +++ b/Completion/Zsh/Command/_zftp @@ -28,13 +28,13 @@ fi case $subcom in *(cd|ls|dir)) # complete remote directories - [[ -z ${functions[zfcd_match]} ]] && autoload -U zfcd_match + [[ -z ${functions[zfcd_match]} ]] && autoload -Uz zfcd_match _tags directories && zfcd_match $PREFIX $SUFFIX ;; *(get(|at)|gcp|delete|remote)) # complete remote files - [[ -z ${functions[zfget_match]} ]] && autoload -U zfget_match + [[ -z ${functions[zfget_match]} ]] && autoload -Uz zfget_match _tags files && zfget_match $PREFIX $SUFFIX ;; diff --git a/Functions/Misc/sticky-note b/Functions/Misc/sticky-note index 53c786c60..6286d61a4 100644 --- a/Functions/Misc/sticky-note +++ b/Functions/Misc/sticky-note @@ -4,7 +4,7 @@ # $HOME/.zsticky). The number of notes stored is STICKYSIZE (1000). # # Load this file as a function: -# autoload -U sticky-note +# autoload -Uz sticky-note # # It may then be bound as a widget: # zle -N sticky-note diff --git a/Functions/Misc/tetris b/Functions/Misc/tetris index a9d367964..697f2c74d 100644 --- a/Functions/Misc/tetris +++ b/Functions/Misc/tetris @@ -1,7 +1,7 @@ # Someone once accused zsh of not being as complete as Emacs, because it # lacks Tetris and an adventure game. # -# autoload -U tetris +# autoload -Uz tetris # zle -N tetris # bindkey '...' tetris diff --git a/Functions/Misc/xtermctl b/Functions/Misc/xtermctl index c771fc39a..040838190 100644 --- a/Functions/Misc/xtermctl +++ b/Functions/Misc/xtermctl @@ -1,7 +1,7 @@ # Put standard xterm/dtterm window control codes in shell parameters for # easy use. Note that some terminals do not support all combinations. -# autoload -U xtermctl ; xtermctl +# autoload -Uz xtermctl ; xtermctl # xtermctl --explain # Run once to set up; implements two functions: diff --git a/Functions/Misc/zed b/Functions/Misc/zed index 9086a1c4c..b43b44b6b 100644 --- a/Functions/Misc/zed +++ b/Functions/Misc/zed @@ -56,7 +56,7 @@ if (( bind )) || ! bindkey -M zed >&/dev/null; then # Make zed-set-file-name available. # Assume it's in fpath; there's no error at this point if it isn't - autoload -U zed-set-file-name + autoload -Uz zed-set-file-name zle -N zed-set-file-name fi if (( bind )) || ! bindkey -M zed-vicmd >&/dev/null; then @@ -74,7 +74,7 @@ if ((fun)) then var="$(functions $1)" # If function is undefined but autoloadable, load it if [[ $var = *\#\ undefined* ]] then - var="$(autoload +X $1; functions $1)" + ar="$(autoload +X $1; functions $1)" elif [[ -z $var ]] then var="$1() { }" diff --git a/Functions/Prompts/prompt_bigfade_setup b/Functions/Prompts/prompt_bigfade_setup index 733bfd406..4e9aafdb1 100644 --- a/Functions/Prompts/prompt_bigfade_setup +++ b/Functions/Prompts/prompt_bigfade_setup @@ -28,7 +28,7 @@ prompt_bigfade_setup () { local cwd=${4:-'yellow'} local -A schars - autoload -U prompt_special_chars + autoload -Uz prompt_special_chars prompt_special_chars PS1="%B%F{$fadebar}$schars[333]$schars[262]$schars[261]$schars[260]%B%F{$userhost}%K{$fadebar}%n@%m%b%k%f%F{$fadebar}%K{black}$schars[260]$schars[261]$schars[262]$schars[333]%b%f%k%F{$fadebar}%K{black}$schars[333]$schars[262]$schars[261]$schars[260]%B%F{$date}%K{black} %D{%a %b %d} %D{%I:%M:%S%P}$prompt_newline%B%F{$cwd}%K{black}$PWD>%b%f%k " diff --git a/Functions/Prompts/prompt_elite2_setup b/Functions/Prompts/prompt_elite2_setup index 68de21cc5..754bf60be 100644 --- a/Functions/Prompts/prompt_elite2_setup +++ b/Functions/Prompts/prompt_elite2_setup @@ -22,7 +22,7 @@ prompt_elite2_setup () { local parens_col=${2:-$text_col} local -A schars - autoload -U prompt_special_chars + autoload -Uz prompt_special_chars prompt_special_chars local text="%b%F{$text_col}" diff --git a/Functions/Prompts/prompt_elite_setup b/Functions/Prompts/prompt_elite_setup index 7af45dd88..0d57f50a0 100644 --- a/Functions/Prompts/prompt_elite_setup +++ b/Functions/Prompts/prompt_elite_setup @@ -22,7 +22,7 @@ prompt_elite_setup () { local punctuation=${2:-'blue'} local -A schars - autoload -U prompt_special_chars + autoload -Uz prompt_special_chars prompt_special_chars PS1="%F{$text}$schars[332]$schars[304]%F{$punctuation}(%F{$text}%n%F{$punctuation}@%F{$text}%m%F{$punctuation})%F{$text}-%F{$punctuation}(%F{$text}%D{%I:%M%P}%F{$punctuation}-:-%F{$text}%D{%m}%F{$punctuation}%F{$text}/%D{%d}%F{$punctuation})%F{$text}$schars[304]-%F{$punctuation}$schars[371]%F{$text}-$schars[371]$schars[371]%F{$punctuation}$schars[372]$prompt_newline%F{$text}$schars[300]$schars[304]%F{$punctuation}(%F{$text}%1~%F{$punctuation})%F{$text}$schars[304]$schars[371]%F{$punctuation}$schars[372]%f" diff --git a/Functions/Prompts/prompt_fade_setup b/Functions/Prompts/prompt_fade_setup index 6d43f723d..0b433dc48 100644 --- a/Functions/Prompts/prompt_fade_setup +++ b/Functions/Prompts/prompt_fade_setup @@ -28,7 +28,7 @@ prompt_fade_setup () { local date=${3:-'white'} local -A schars - autoload -U prompt_special_chars + autoload -Uz prompt_special_chars prompt_special_chars PS1="%F{$fadebar_cwd}%B%K{$fadebar_cwd}$schars[333]$schars[262]$schars[261]$schars[260]%F{$userhost}%K{$fadebar_cwd}%B%n@%m%b%F{$fadebar_cwd}%K{black}$schars[333]$schars[262]$schars[261]$schars[260]%F{$date}%K{black}%B %D{%a %b %d} %D{%I:%M:%S%P} $prompt_newline%F{fadebar_cwd}%K{black}%B%~/%b%k%f " diff --git a/Functions/Prompts/prompt_fire_setup b/Functions/Prompts/prompt_fire_setup index 7043fd456..7bb8367d5 100644 --- a/Functions/Prompts/prompt_fire_setup +++ b/Functions/Prompts/prompt_fire_setup @@ -30,7 +30,7 @@ prompt_fire_setup () { local cwd=${6:-'yellow'} local -a schars - autoload -U prompt_special_chars + autoload -Uz prompt_special_chars prompt_special_chars local GRAD1="%{$schars[333]$schars[262]$schars[261]$schars[260]%}" diff --git a/Functions/Prompts/promptinit b/Functions/Prompts/promptinit index f68191dd2..8f964578e 100644 --- a/Functions/Prompts/promptinit +++ b/Functions/Prompts/promptinit @@ -2,7 +2,7 @@ ## zsh prompt themes extension ## by Adam Spiers <adam@spiers.net> ## -## Load with `autoload -U promptinit; promptinit'. +## Load with `autoload -Uz promptinit; promptinit'. ## Type `prompt -h' for help. ## diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line index f11a37482..4a9b10a1a 100644 --- a/Functions/Zle/edit-command-line +++ b/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 edit-command-line +# autoload -z edit-command-line # zle -N edit-command-line # bindkey -M vicmd v edit-command-line # will give ksh-like behaviour for that key, diff --git a/Functions/Zle/history-beginning-search-menu b/Functions/Zle/history-beginning-search-menu index 916639adc..891374925 100644 --- a/Functions/Zle/history-beginning-search-menu +++ b/Functions/Zle/history-beginning-search-menu @@ -3,7 +3,7 @@ # the entire history is searched. # # Configuration: -# autoload -U history-beginning-search-menu +# autoload -Uz history-beginning-search-menu # zle -N history-beginning-search-menu # bindkey '\eP' history-beginning-search-menu # diff --git a/Functions/Zle/incarg b/Functions/Zle/incarg index c4b05d01f..cff0cfe4c 100644 --- a/Functions/Zle/incarg +++ b/Functions/Zle/incarg @@ -1,6 +1,6 @@ # Shell function to increment an integer either under the cursor or just # to the left of it. Use -# autoload -U incarg +# autoload -Uz incarg # zle -N incarg # bindkey "..." incarg # to define it. For example, diff --git a/Functions/Zle/modify-current-argument b/Functions/Zle/modify-current-argument index dd0b85a82..92ca7bdab 100644 --- a/Functions/Zle/modify-current-argument +++ b/Functions/Zle/modify-current-argument @@ -16,7 +16,7 @@ setopt localoptions noksharrays multibyte local -a reply integer REPLY REPLY2 -autoload -U split-shell-arguments +autoload -Uz split-shell-arguments split-shell-arguments # Can't do this unless there's some text under or left of us. diff --git a/Functions/Zle/narrow-to-region-invisible b/Functions/Zle/narrow-to-region-invisible index d70966b96..312522d07 100644 --- a/Functions/Zle/narrow-to-region-invisible +++ b/Functions/Zle/narrow-to-region-invisible @@ -1,5 +1,5 @@ # As narrow-to-region, but replaces the text outside the editable region # with `...' if it was non-empty. Can be used directly as a widget. -autoload -U narrow-to-region +autoload -Uz narrow-to-region narrow-to-region -p '...' -P '...' -n diff --git a/Functions/Zle/predict-on b/Functions/Zle/predict-on index 33478c0b5..57fe048d5 100644 --- a/Functions/Zle/predict-on +++ b/Functions/Zle/predict-on @@ -15,7 +15,7 @@ # with RETURN, without needing to move the cursor to the end first. # # To use it: -# autoload -U predict-on +# autoload -Uz predict-on # zle -N predict-on # zle -N predict-off # bindkey '...' predict-on diff --git a/Functions/Zle/quote-and-complete-word b/Functions/Zle/quote-and-complete-word index e2646dbaa..a8c0618ae 100644 --- a/Functions/Zle/quote-and-complete-word +++ b/Functions/Zle/quote-and-complete-word @@ -5,7 +5,7 @@ # normal completion fails, the quotes are removed again. # # To use it: -# autoload -U quote-and-complete-word +# autoload -Uz quote-and-complete-word # zle -N quote-and-complete-word # bindkey '\t' quote-and-complete-word # diff --git a/Functions/Zle/transpose-words-match b/Functions/Zle/transpose-words-match index 6e12c4fa1..8885c0b81 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 match-words-by-style +autoload -z match-words-by-style local curcontext=":zle:$WIDGET" skip local -a matched_words diff --git a/Functions/Zle/url-quote-magic b/Functions/Zle/url-quote-magic index 826d26d09..ee8b6f62f 100644 --- a/Functions/Zle/url-quote-magic +++ b/Functions/Zle/url-quote-magic @@ -5,7 +5,7 @@ # the input character. # Setup: -# autoload -U url-quote-magic +# autoload -Uz url-quote-magic # zle -N self-insert url-quote-magic # A number of zstyles may be set to control the quoting behavior. diff --git a/StartupFiles/zshrc b/StartupFiles/zshrc index 88eea069e..2685c23dd 100644 --- a/StartupFiles/zshrc +++ b/StartupFiles/zshrc @@ -117,7 +117,7 @@ bindkey '^I' complete-word # complete on tab, leave expansion to _expand # Setup new style completion system. To see examples of the old style (compctl # based) programmable completion, check Misc/compctl-examples in the zsh # distribution. -autoload -U compinit +autoload -Uz compinit compinit # Completion Styles |