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

driver: Tolerate KSH_ARRAYS being set in the calling context.

Browse Source 
Fixes zsh-users/zsh-syntax-highlighting#162.
This commit is contained in:
Daniel Shahaf 2015-11-17 00:48:22 +00:00
parent 6e3720f39d
commit 8f19af6b31
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zsh-syntax-highlighting.zsh
View File

@ -30,8 +30,8 @@
if [[ -o function_argzero ]]; then if [[ -o function_argzero ]]; then
# $0 is reliable # $0 is reliable
ZSH_HIGHLIGHT_VERSION=$(<"$0:A:h"/.version) ZSH_HIGHLIGHT_VERSION=$(<"${0:A:h}"/.version)
ZSH_HIGHLIGHT_REVISION=$(<"$0:A:h"/.revision-hash) ZSH_HIGHLIGHT_REVISION=$(<"${0:A:h}"/.revision-hash)
if [[ $ZSH_HIGHLIGHT_REVISION == \$Format:* ]]; then if [[ $ZSH_HIGHLIGHT_REVISION == \$Format:* ]]; then
# When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION # When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION
# would be set to '$Format:%H$' literally. That's an invalid value, and obtaining # would be set to '$Format:%H$' literally. That's an invalid value, and obtaining
@ -63,6 +63,7 @@ _zsh_highlight()
local ret=$? local ret=$?
setopt localoptions warncreateglobal setopt localoptions warncreateglobal
setopt localoptions noksharrays
local REPLY # don't leak $REPLY into global scope local REPLY # don't leak $REPLY into global scope
# Do not highlight if there are more than 300 chars in the buffer. It's most # Do not highlight if there are more than 300 chars in the buffer. It's most
@ -189,6 +190,8 @@ _zsh_highlight_call_widget()
# Rebind all ZLE widgets to make them invoke _zsh_highlights. # Rebind all ZLE widgets to make them invoke _zsh_highlights.
_zsh_highlight_bind_widgets() _zsh_highlight_bind_widgets()
{ {
setopt localoptions noksharrays
# Load ZSH module zsh/zleparameter, needed to override user defined widgets. # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
zmodload zsh/zleparameter 2>/dev/null || { zmodload zsh/zleparameter 2>/dev/null || {
echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2 echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2
@ -229,6 +232,8 @@ _zsh_highlight_bind_widgets()
# 1) Path to the highlighters directory. # 1) Path to the highlighters directory.
_zsh_highlight_load_highlighters() _zsh_highlight_load_highlighters()
{ {
setopt localoptions noksharrays
# Check the directory exists. # Check the directory exists.
[[ -d "$1" ]] || { [[ -d "$1" ]] || {
echo "zsh-syntax-highlighting: highlighters directory '$1' not found." >&2 echo "zsh-syntax-highlighting: highlighters directory '$1' not found." >&2