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

Compare commits

merge into: stonewareslord:master
Branches Tags
stonewareslord:master
stonewareslord:feature/redrawhook
stonewareslord:i652-v1
stonewareslord:themes
stonewareslord:0.5.x
stonewareslord:0.4.x
stonewareslord:0.7.1
stonewareslord:0.7.0
stonewareslord:0.7.0-beta1
stonewareslord:0.6.0
stonewareslord:0.6.0-rc1
stonewareslord:0.5.0
stonewareslord:0.4.1
stonewareslord:0.4.0
stonewareslord:0.3.0
stonewareslord:0.2.1
stonewareslord:0.2.0
stonewareslord:0.1.3
stonewareslord:0.1.2
stonewareslord:0.1.1
stonewareslord:0.1.0
...
pull from: stonewareslord:0.4.x
Branches Tags
stonewareslord:master
stonewareslord:feature/redrawhook
stonewareslord:i652-v1
stonewareslord:themes
stonewareslord:0.5.x
stonewareslord:0.4.x
stonewareslord:0.7.1
stonewareslord:0.7.0
stonewareslord:0.7.0-beta1
stonewareslord:0.6.0
stonewareslord:0.6.0-rc1
stonewareslord:0.5.0
stonewareslord:0.4.1
stonewareslord:0.4.0
stonewareslord:0.3.0
stonewareslord:0.2.1
stonewareslord:0.2.0
stonewareslord:0.1.3
stonewareslord:0.1.2
stonewareslord:0.1.1
stonewareslord:0.1.0

5 Commits
master ... 0.4.x

Author SHA1 Message Date
Daniel Shahaf
7ac72a57bc Post-release version number bump. 2016-01-27 20:55:15 +00:00
Daniel Shahaf
c19ee58313 Tag version 0.4.1 2016-01-27 20:55:15 +00:00
Daniel Shahaf
9c33f34ebe changelog: Update for upcoming 0.4.1 release. 
(cherry picked from commit 683f4837a0)
 2016-01-27 20:49:50 +00:00
Daniel Shahaf
8734fb46b5 changelog: Start 0.4.1 section. 
Also fix an error in the title of the 0.4.0 section.

(cherry picked from commit cf685a3a27)
 2016-01-27 20:49:50 +00:00
Daniel Shahaf
4ad3d23c6d Revert "wrapping: Don't add '--' when invoking widgets." 
The '--' guard was correct; it was there to guard against arguments belonging
to the syntax «zle widget [ -n num ] [ -Nw ] [ -K keymap ] args».

For example, this affected using <backward-kill-word> over
    BUFFER="-w "
    CURSOR=3
after
    autoload -Uz select-word-style
    select-word-style default
    zstyle ':zle:backward-kill-word' word-style shell
.

This reverts commit c808d2187a.

(cherry picked from commit 282c7134e8)
 2016-01-27 20:31:39 +00:00
3 changed files with 15 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
0.4.1-dev 0.4.2-dev

14
changelog.md
View File

@ -1,9 +1,17 @@
up to 952a97dbc99a54bd86141b7a57625e748941a937
# Changes in version 0.3.1 # Changes in version 0.4.1
## Fixes:
- Arguments to widgets were not properly dash-escaped. Only matters for widgets
that take arguments (i.e., that are invoked as `zle ${widget} -- ${args}`).
(282c7134e8ac, reverts c808d2187a73)
# Changes in version 0.4.0
## Added highlighting of: ## Added highlighting of:
@ -104,7 +112,7 @@ up to 952a97dbc99a54bd86141b7a57625e748941a937
(57624bb9f64b) (57624bb9f64b)
- widgets wrapping: Don't add '--' when invoking widgets. - widgets wrapping: Don't add '--' when invoking widgets.
(c808d2187a73) (c808d2187a73) [_reverted in 0.4.1_]
- Refresh highlighting upon `accept-*` widgets (`accept-line` et al). - Refresh highlighting upon `accept-*` widgets (`accept-line` et al).
(59fbdda64c21) (59fbdda64c21)

6
zsh-syntax-highlighting.zsh
View File

@ -208,16 +208,16 @@ _zsh_highlight_bind_widgets()
# User defined widget: override and rebind old one with prefix "orig-". # User defined widget: override and rebind old one with prefix "orig-".
user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \ user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
_zsh_highlight_widget_$cur_widget() { _zsh_highlight_call_widget orig-$cur_widget \"\$@\" }; \ _zsh_highlight_widget_$cur_widget() { _zsh_highlight_call_widget orig-$cur_widget -- \"\$@\" }; \
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";; zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
# Completion widget: override and rebind old one with prefix "orig-". # Completion widget: override and rebind old one with prefix "orig-".
completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \ completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \
_zsh_highlight_widget_$cur_widget() { _zsh_highlight_call_widget orig-$cur_widget \"\$@\" }; \ _zsh_highlight_widget_$cur_widget() { _zsh_highlight_call_widget orig-$cur_widget -- \"\$@\" }; \
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";; zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
# Builtin widget: override and make it call the builtin ".widget". # Builtin widget: override and make it call the builtin ".widget".
builtin) eval "_zsh_highlight_widget_$cur_widget() { _zsh_highlight_call_widget .$cur_widget \"\$@\" }; \ builtin) eval "_zsh_highlight_widget_$cur_widget() { _zsh_highlight_call_widget .$cur_widget -- \"\$@\" }; \
zle -N $cur_widget _zsh_highlight_widget_$cur_widget";; zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
# Default: unhandled case. # Default: unhandled case.