stonewareslord/zsh-syntax-highlighting
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

'main': Fix regression in zsh 5.3.1 and older: all precmd hooks later than z-sy-h would be aborted.

Browse Source 
In those versions of zsh, «[[ -o nosuchoption ]]» is regarded as
a syntax error.  In newer zsh versions, it merely returns non-zero
(specifically, it returns 3, unlike «[[ -o unsetoption ]]» which
returns 1).

Fixes #732.
Fixes #733.
This commit is contained in:
Daniel Shahaf 2020-05-06 20:25:03 +00:00
parent 0582ea1910
commit 3a4b212c7d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.md
View File

@ -77,7 +77,7 @@
- Fix an error message on stderr before every prompt when the `WARN_NESTED_VAR` zsh option is set: - Fix an error message on stderr before every prompt when the `WARN_NESTED_VAR` zsh option is set:
`_zsh_highlight_main__precmd_hook:1: array parameter _zsh_highlight_main__command_type_cache set in enclosing scope in function _zsh_highlight_main__precmd_hook` `_zsh_highlight_main__precmd_hook:1: array parameter _zsh_highlight_main__command_type_cache set in enclosing scope in function _zsh_highlight_main__precmd_hook`
[#727, #731] [#727, #731, #732, #733]
# Changes in version 0.7.1 # Changes in version 0.7.1

2
highlighters/main/main-highlighter.zsh
View File

@ -1692,7 +1692,7 @@ _zsh_highlight_main__precmd_hook() {
# Unset the WARN_NESTED_VAR option, taking care not to error if the option # Unset the WARN_NESTED_VAR option, taking care not to error if the option
# doesn't exist (zsh older than zsh-5.3.1-test-2). # doesn't exist (zsh older than zsh-5.3.1-test-2).
setopt localoptions setopt localoptions
if [[ -o warnnestedvar ]] 2>/dev/null; then if eval '[[ -o warnnestedvar ]]' 2>/dev/null; then
unsetopt warnnestedvar unsetopt warnnestedvar
fi fi