From 4ad3d23c6d455f506c2bd889db069e702f394523 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Sun, 17 Jan 2016 19:35:07 +0000
Subject: [PATCH 1/4] Revert "wrapping: Don't add '--' when invoking widgets."
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 c808d2187a7331dff4d493a945482d718e63bc7a.

(cherry picked from commit 282c7134e8acdf241397c207300a65ad9be12e16)
---
 zsh-syntax-highlighting.zsh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index 3e243d2..905672f 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -208,16 +208,16 @@ _zsh_highlight_bind_widgets()
 
       # User defined widget: override and rebind old one with prefix "orig-".
       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";;
 
       # Completion widget: override and rebind old one with prefix "orig-".
       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";;
 
       # 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";;
 
       # Default: unhandled case.

From 8734fb46b59311fdbfc2f707909177f219b9c44b Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Sun, 29 Nov 2015 02:00:51 +0000
Subject: [PATCH 2/4] changelog: Start 0.4.1 section.

Also fix an error in the title of the 0.4.0 section.

(cherry picked from commit cf685a3a27d1a6745b1871e7e5280b917cae3fec)
---
 changelog.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 56e3536..edcd93b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,10 @@ up to 952a97dbc99a54bd86141b7a57625e748941a937
 
 
 
-# Changes in version 0.3.1
+# Changes in version 0.4.1
+
+
+# Changes in version 0.4.0
 
 
 ## Added highlighting of:

From 9c33f34ebe539d8c1ce1c848ef9216421c3330d2 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 27 Jan 2016 20:48:56 +0000
Subject: [PATCH 3/4] changelog: Update for upcoming 0.4.1 release.

(cherry picked from commit 683f4837a037e35e6a5236020e855fcd262ed48d)
---
 changelog.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index edcd93b..94cb929 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,16 @@
-up to 952a97dbc99a54bd86141b7a57625e748941a937
+up to 952a97dbc99a54bd86141b7a57625e748941a937 + 0.4.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
 
@@ -107,7 +113,7 @@ up to 952a97dbc99a54bd86141b7a57625e748941a937
   (57624bb9f64b)
 
 - widgets wrapping: Don't add '--' when invoking widgets.
-  (c808d2187a73)
+  (c808d2187a73) [_reverted in 0.4.1_]
 
 - Refresh highlighting upon `accept-*` widgets (`accept-line` et al).
   (59fbdda64c21)

From c19ee583138ebab416b0d2efafbad7dc9f3f7c4f Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 27 Jan 2016 20:53:22 +0000
Subject: [PATCH 4/4] Tag version 0.4.1

---
 .version     | 2 +-
 changelog.md | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.version b/.version
index 1351681..267577d 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.4.1-dev
+0.4.1
diff --git a/changelog.md b/changelog.md
index 94cb929..c8703be 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,3 @@
-up to 952a97dbc99a54bd86141b7a57625e748941a937 + 0.4.1