From af0099465ff2e36cf0dfef0e37d85eb6bf7cae1a Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 19 Oct 2016 23:03:16 +0000
Subject: [PATCH 1/5] =?UTF-8?q?Revert=20"driver:=20Enable=20highlighting?=
 =?UTF-8?q?=20during=20isearch=20under=20zsh=E2=89=A55.3."?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4ad311ec0a6837b7c83bcfd1a1bf12cceb03f363.
---
 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 ec01306..ee13762 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -60,7 +60,7 @@ _zsh_highlight()
 
   # Remove all highlighting in isearch, so that only the underlining done by zsh itself remains.
   # For details see FAQ entry 'Why does syntax highlighting not work while searching history?'.
-  if [[ $WIDGET == zle-isearch-update ]] && ! (( $+ISEARCHMATCH_ACTIVE )); then
+  if [[ $WIDGET == zle-isearch-update ]]; then
     region_highlight=()
     return $ret
   fi

From 39ab1b732132804c84e97b0493789b68404c9649 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 19 Oct 2016 23:03:19 +0000
Subject: [PATCH 2/5] Revert "driver: Track rename of an unreleased upstream
 API."

This reverts commit 15db71abd0cced43513d61b9d9a6b5ca21fee14b.
---
 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 ee13762..1313d5c 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -143,7 +143,7 @@ _zsh_highlight()
     (( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
 
     # isearch
-    (( $+ISEARCHMATCH_ACTIVE )) && (( ISEARCHMATCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCHMATCH_START" "$ISEARCHMATCH_END"
+    (( $+ISEARCH_ACTIVE )) && (( ISEARCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCH_START" "$ISEARCH_END"
 
     # suffix
     (( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"

From 31250c77bfce764c9540037911ae25fb586de10c Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 19 Oct 2016 23:03:19 +0000
Subject: [PATCH 3/5] Revert "apply suffix and isearch zle_highlights on top"

This reverts commit 79e4d3d1240599ab00a5e9aae54dfbd5c18fb270.
---
 zsh-syntax-highlighting.zsh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/zsh-syntax-highlighting.zsh b/zsh-syntax-highlighting.zsh
index 1313d5c..35c0364 100644
--- a/zsh-syntax-highlighting.zsh
+++ b/zsh-syntax-highlighting.zsh
@@ -142,12 +142,6 @@ _zsh_highlight()
     # yank / paste (zsh-5.1.1 and newer)
     (( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
 
-    # isearch
-    (( $+ISEARCH_ACTIVE )) && (( ISEARCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCH_START" "$ISEARCH_END"
-
-    # suffix
-    (( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"
-
 
     return $ret
 

From e5a59f6b5613659fb524668eb1293b036a69b883 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Mon, 24 Oct 2016 11:32:21 +0000
Subject: [PATCH 4/5] changelog: Update for post-branch changes.

---
 changelog.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index 4af6af7..87e5f73 100644
--- a/changelog.md
+++ b/changelog.md
@@ -27,11 +27,6 @@ in this area.
 - Aliases that cannot be defined normally nor invoked normally (highlighted as an error).
   (#263 (in part), 28932316cca6)
 
-- The `isearch` and `suffix` [`$zle_highlight` settings][zshzle-Character-Highlighting].
-  (79e4d3d12405, 15db71abd0cc; requires zsh 5.3 for `$ISEARCHMATCH_ACTIVE` / `$SUFFIX_ACTIVE` support)
-
-[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
-
 - Path separators (`/`) — the default behaviour remains to highlight path separators
   and path components the same way.
   (#136, #260, 6cd39e7c70d3, 9a934d291e7c, f3d3aaa00cc4)

From 15d4587514a3beaa13972093e335bf685b6726a9 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Sun, 23 Oct 2016 17:38:55 +0000
Subject: [PATCH 5/5] Tag version 0.5.0.

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

diff --git a/.version b/.version
index 4259c64..8f0916f 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.5.0-dev
+0.5.0
diff --git a/changelog.md b/changelog.md
index 87e5f73..c25aaec 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,3 @@
-up to 28d7056a7a06
-
 # Changes in version 0.5.0