summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_refresh.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ef80f96fc..e219643d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-31  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 37456: Src/Zle/zle_refresh.c: Have zle_highlight=(none)
+	disable paste highlighting
+
 2015-12-30  Frank Terbeck  <ft@bewatermyfriend.org>
 
 	* 37451: Functions/VCS_Info/vcs_info: vcs_info: Declare "msgs" in
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 6facff429..3d2471e27 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -338,9 +338,9 @@ zle_set_highlight(void)
 	for (; *atrs; atrs++) {
 	    if (!strcmp(*atrs, "none")) {
 		/* reset attributes for consistency... usually unnecessary */
-		special_atr_on = default_atr_on =
-		    paste_atr_on_set = 0;
-		special_atr_on_set = region_atr_on_set =
+		special_atr_on = default_atr_on = 0;
+		special_atr_on_set = 1;
+		paste_atr_on_set = region_atr_on_set =
 		    isearch_atr_on_set = suffix_atr_on_set = 1;
 	    } else if (strpfx("default:", *atrs)) {
 		match_highlight(*atrs + 8, &default_atr_on);