diff options
| author | Philip Sequeira <phsequei@gmail.com> | 2015-12-07 18:23:25 -0500 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2015-12-23 01:57:45 +0100 |
| commit | 038b1d4b38fca3b2067bcc322096a00179f63b88 (patch) | |
| tree | 81dd470790bfb5aff1c48b45ae3609fc42a89c1f | |
| parent | aedff53d1f2436ebe59be3253ff4a22d442684d5 (diff) | |
| download | zsh-038b1d4b38fca3b2067bcc322096a00179f63b88.tar.gz zsh-038b1d4b38fca3b2067bcc322096a00179f63b88.tar.xz zsh-038b1d4b38fca3b2067bcc322096a00179f63b88.zip | |
37345: VCS_INFO functions break with setopt no_unset
With setopt no_unset in my config file, vcs_info fails with: VCS_INFO_maxexports:7: vcs: parameter not set
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_maxexports | 2 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_set | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3e42cc91e..3b67eba9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-12-23 Philip Sequeira <phsequei@gmail.com> + + * 37345: Functions/VCS_Info/VCS_INFO_maxexports, + Functions/VCS_Info/VCS_INFO_set: VCS_INFO functions break with + setopt no_unset + 2015-12-19 Barton E. Schaefer <schaefer@zsh.org> * users/21082 (expanded): Functions/Misc/is-at-least: do a more diff --git a/Functions/VCS_Info/VCS_INFO_maxexports b/Functions/VCS_Info/VCS_INFO_maxexports index ea952517f..d697b9abd 100644 --- a/Functions/VCS_Info/VCS_INFO_maxexports +++ b/Functions/VCS_Info/VCS_INFO_maxexports @@ -2,7 +2,7 @@ ## Written by Frank Terbeck <ft@bewatermyfriend.org> ## Distributed under the same BSD-ish license as zsh itself. -setopt localoptions NO_shwordsplit +setopt localoptions NO_shwordsplit unset zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" "max-exports" maxexports || maxexports=2 if [[ ${maxexports} != <-> ]] || (( maxexports < 1 )); then diff --git a/Functions/VCS_Info/VCS_INFO_set b/Functions/VCS_Info/VCS_INFO_set index 484c7937d..e3f62ceef 100644 --- a/Functions/VCS_Info/VCS_INFO_set +++ b/Functions/VCS_Info/VCS_INFO_set @@ -2,7 +2,7 @@ ## Written by Frank Terbeck <ft@bewatermyfriend.org> ## Distributed under the same BSD-ish license as zsh itself. -setopt localoptions noksharrays NO_shwordsplit +setopt localoptions noksharrays NO_shwordsplit unset local -i i j if [[ $1 == '--nvcs' ]] ; then |