From 5958662772eb734e5386d815f0b9b0a656d7ab20 Mon Sep 17 00:00:00 2001 From: Julien Nicoulaud Date: Sat, 1 Jan 2011 16:01:30 +0100 Subject: [PATCH] Issue 14: Do not highlight globbing if noglob is present --- zsh-syntax-highlighting.zsh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh index a3428a9..3035ddb 100755 --- a/zsh-syntax-highlighting.zsh +++ b/zsh-syntax-highlighting.zsh @@ -144,10 +144,12 @@ _zsh_highlight-zle-buffer() { setopt localoptions extendedglob bareglobqual local colorize=true local start_pos=0 + local highlight_glob=true local end_pos arg style region_highlight=() for arg in ${(z)BUFFER}; do local substr_color=0 + [[ $start_pos -eq 0 && $arg = 'noglob' ]] && highlight_glob=false ((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]##[[:space:]]#}})) ((end_pos=$start_pos+${#arg})) if $colorize; then @@ -175,7 +177,7 @@ _zsh_highlight-zle-buffer() { substr_color=1 ;; '`'*'`') style=$ZSH_SYNTAX_HIGHLIGHTING_STYLES[back-quoted-argument];; - *"*"*) style=$ZSH_SYNTAX_HIGHLIGHTING_STYLES[globbing];; + *"*"*) $highlight_glob && style=$ZSH_SYNTAX_HIGHLIGHTING_STYLES[globbing] || style=$ZSH_SYNTAX_HIGHLIGHTING_STYLES[default];; *) _zsh_check-path && style=$ZSH_SYNTAX_HIGHLIGHTING_STYLES[path] || style=$ZSH_SYNTAX_HIGHLIGHTING_STYLES[default];; esac fi