diff options
| author | Mikael Magnusson <mikachu@gmail.com> | 2012-05-02 13:09:37 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2012-05-02 13:09:37 +0000 |
| commit | 150dc9021bcf8a03671424142a9ffbfecd516915 (patch) | |
| tree | 1d59d0a6ae1eb65db290b13a3b9b87f368c11e7f | |
| parent | cd1b5d86e0a6ac37e982c6a3b8725fd11076f14c (diff) | |
| download | zsh-150dc9021bcf8a03671424142a9ffbfecd516915.tar.gz zsh-150dc9021bcf8a03671424142a9ffbfecd516915.tar.xz zsh-150dc9021bcf8a03671424142a9ffbfecd516915.zip | |
30461, 30462 (tweaked): add missing local for match, mbegin and mend
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Functions/Prompts/promptinit | 1 | ||||
| -rw-r--r-- | Functions/VCS_Info/vcs_info_setsys | 1 | ||||
| -rw-r--r-- | Functions/Zftp/zfcd_match | 1 | ||||
| -rw-r--r-- | Functions/Zle/url-quote-magic | 2 |
5 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 23713f54f..3ef0c6946 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-05-02 Mikael Magnusson <mikachu@gmail.com> + + * 30461, 30462 (tweaked): Functions/Prompts/promptinit, + Functions/VCS_Info/vcs_info_setsys, Functions/Zftp/zfcd_match, + Functions/Zle/url-quote-magic: add missing local for match, + mbegin and mend. + 2012-05-01 Peter Stephenson <p.w.stephenson@ntlworld.com> * users/17046: Src/utils.c, Test/D04parameter.ztst: don't @@ -16260,5 +16267,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5645 $ +* $Revision: 1.5646 $ ***************************************************** diff --git a/Functions/Prompts/promptinit b/Functions/Prompts/promptinit index 66e73a7a5..edf2d028b 100644 --- a/Functions/Prompts/promptinit +++ b/Functions/Prompts/promptinit @@ -15,6 +15,7 @@ promptinit () { emulate -L zsh setopt extendedglob local ppath='' name theme + local -a match mbegin mend # Autoload all prompt_*_setup functions in fpath for theme in $^fpath/prompt_*_setup(N); do diff --git a/Functions/VCS_Info/vcs_info_setsys b/Functions/VCS_Info/vcs_info_setsys index 1484464ce..a4c3036be 100644 --- a/Functions/VCS_Info/vcs_info_setsys +++ b/Functions/VCS_Info/vcs_info_setsys @@ -7,6 +7,7 @@ setopt extendedglob typeset_silent local sys typeset -ga VCS_INFO_backends +local -a match mbegin mend VCS_INFO_backends=() diff --git a/Functions/Zftp/zfcd_match b/Functions/Zftp/zfcd_match index 16de5c81c..95de4c583 100644 --- a/Functions/Zftp/zfcd_match +++ b/Functions/Zftp/zfcd_match @@ -13,6 +13,7 @@ local ZFTP_VERBOSE=45 # should we redirect 2>/dev/null or let the user see it? local tmpf=${TMPPREFIX}zfcm$$ +local -a match mbegin mend if [[ $ZFTP_SYSTEM = UNIX* ]]; then # hoo, aren't we lucky: this makes things so much easier diff --git a/Functions/Zle/url-quote-magic b/Functions/Zle/url-quote-magic index 4e12253e7..fbcc7c19c 100644 --- a/Functions/Zle/url-quote-magic +++ b/Functions/Zle/url-quote-magic @@ -60,7 +60,7 @@ # Use compsys for nested quoting analysis and command parsing. # Establish default values for styles, but only if not already set -local -a reply +local -a reply match mbegin mend zstyle -m ':url-quote-magic:\*' url-metas '*' || zstyle ':url-quote-magic:*' url-metas '*?[]^(|)~#{}=' |