From 44fd26a0cc800a62fe75138e6bdefc3131010be1 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 25 Dec 2010 18:07:01 -0800 Subject: [PATCH 1/3] Fix potential errors for some setopt variations. --- zsh-syntax-highlighting.zsh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh index 0091c90..0d50f37 100644 --- a/zsh-syntax-highlighting.zsh +++ b/zsh-syntax-highlighting.zsh @@ -25,6 +25,7 @@ ZLE_DEFAULT='fg=white,bold' ZLE_TOKENS_FOLLOWED_BY_COMMANDS=('|' '||' ';' '&' '&&' 'sudo' 'start' 'time' 'strace' '§') _check_path() { + setopt localoptions null_glob [ -z "$arg" ] && return 1 [ -e $arg ] && return 0 [ ! -e "`dirname $arg`" ] && return 1 @@ -48,7 +49,7 @@ colorize-zle-buffer() { *'an alias'*) style=$ZLE_ALIAS_STYLE;; *'shell builtin'*) style=$ZLE_BUILTIN_STYLE;; *'shell function'*) style=$ZLE_FUNCTION_STYLE;; - *"$cmd is"*) style=$ZLE_COMMAND_STYLE;; + *"${cmd:-no-command-specified} is"*) style=$ZLE_COMMAND_STYLE;; *) style=$ZLE_COMMAND_UNKNOWN_TOKEN_STYLE _check_path && style=$ZLE_PATH_STYLE From 57da7c9a287efc4da379f5ae5354411bcff39b50 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 25 Dec 2010 23:51:38 -0800 Subject: [PATCH 2/3] Some changes from Bart's issue 6. --- zsh-syntax-highlighting.zsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh index 0d50f37..9275188 100644 --- a/zsh-syntax-highlighting.zsh +++ b/zsh-syntax-highlighting.zsh @@ -25,21 +25,21 @@ ZLE_DEFAULT='fg=white,bold' ZLE_TOKENS_FOLLOWED_BY_COMMANDS=('|' '||' ';' '&' '&&' 'sudo' 'start' 'time' 'strace' '§') _check_path() { - setopt localoptions null_glob - [ -z "$arg" ] && return 1 - [ -e $arg ] && return 0 - [ ! -e "`dirname $arg`" ] && return 1 - [ ${#BUFFER} = $end_pos -a -n "`print $arg*`" ] && return 0 + [[ -z $arg ]] && return 1 + [[ -e $arg ]] && return 0 + [[ ! -e ${arg:h} ]] && return 1 + [[ ${#BUFFER} == $end_pos && -n $(print $arg*(N)) ]] && return 0 return 1 } # Recolorize the current ZLE buffer. colorize-zle-buffer() { + setopt localoptions extendedglob region_highlight=() colorize=true start_pos=0 for arg in ${(z)BUFFER}; do - ((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]## #}})) + ((start_pos+=${#BUFFER[$start_pos+1,-1]}-${#${BUFFER[$start_pos+1,-1]##[[:space:]]#}})) ((end_pos=$start_pos+${#arg})) if $colorize; then colorize=false From ff908d11283f0f73f2228da5b56e06e9d1e7d2df Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sun, 26 Dec 2010 11:56:05 -0800 Subject: [PATCH 3/3] =?UTF-8?q?Removing=20'=C2=A7'=20from=20ZLE=5FTOKENS?= =?UTF-8?q?=5FFOLLOWED=5FBY=5FCOMMANDS.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zsh-syntax-highlighting.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh index 9275188..160302f 100644 --- a/zsh-syntax-highlighting.zsh +++ b/zsh-syntax-highlighting.zsh @@ -22,7 +22,7 @@ ZLE_GLOBING='fg=blue,bold' ZLE_DEFAULT='fg=white,bold' -ZLE_TOKENS_FOLLOWED_BY_COMMANDS=('|' '||' ';' '&' '&&' 'sudo' 'start' 'time' 'strace' '§') +ZLE_TOKENS_FOLLOWED_BY_COMMANDS=('|' '||' ';' '&' '&&' 'sudo' 'start' 'time' 'strace') _check_path() { [[ -z $arg ]] && return 1