diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-11-22 16:06:20 +0000 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-11-22 16:06:20 +0000 |
| commit | ae4cf7b743da0785cb8d1f0d01b8697318f254dc (patch) | |
| tree | 5eb07362874b8451ac3723a49f1fc36092cb69b0 | |
| parent | b1688305cc83e63104d4c581f649bbdcffa0e3b8 (diff) | |
| download | zsh-ae4cf7b743da0785cb8d1f0d01b8697318f254dc.tar.gz zsh-ae4cf7b743da0785cb8d1f0d01b8697318f254dc.tar.xz zsh-ae4cf7b743da0785cb8d1f0d01b8697318f254dc.zip | |
37186: a couple more WARN_CREATE_GLOBAL fixes
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_nvcsformats | 1 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e1e2186c7..ce46dccf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-11-22 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 37186: Functions/VCS_Info/VCS_INFO_nvcsformats, + Src/Zle/zle_main.c: a couple of WARN_CREATE_GLOBAL fixes. + 2015-11-21 Barton E. Schaefer <schaefer@zsh.org> * 37181: Test/C02cond.ztst, Test/D07multibyte.ztst, diff --git a/Functions/VCS_Info/VCS_INFO_nvcsformats b/Functions/VCS_Info/VCS_INFO_nvcsformats index 581aa5a97..203a86d23 100644 --- a/Functions/VCS_Info/VCS_INFO_nvcsformats +++ b/Functions/VCS_Info/VCS_INFO_nvcsformats @@ -4,6 +4,7 @@ setopt localoptions noksharrays NO_shwordsplit local c v rr +local -a msgs if [[ $1 == '-preinit-' ]] ; then c='default' diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 593d636cc..38427e8e3 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -2045,7 +2045,8 @@ setup_(UNUSED(Module m)) bpaste = zshcalloc(3*sizeof(char *)); bpaste[0] = ztrdup("\033[?2004h"); bpaste[1] = ztrdup("\033[?2004l"); - setaparam("zle_bracketed_paste", bpaste); + /* Intended to be global, no WARNCREATEGLOBAL check. */ + assignaparam("zle_bracketed_paste", bpaste, 0); return 0; } |