about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/zle.yo2
-rw-r--r--Src/Zle/zle_refresh.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a484ad7fc..aedeaed4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-09-11  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 36443: Doc/Zsh/zle.yo Src/Zle/zle_refresh.c: Set
+	zle_highlight=(paste:standout) by default.
+
 	* 36443: Revert 35834.
 
 2015-09-11  Peter Stephenson  <p.w.stephenson@ntlworld.com>
diff --git a/Doc/Zsh/zle.yo b/Doc/Zsh/zle.yo
index 2c539c460..71a7af0d7 100644
--- a/Doc/Zsh/zle.yo
+++ b/Doc/Zsh/zle.yo
@@ -2679,7 +2679,7 @@ If tt(zle_highlight) is not set or no value applies to a particular
 context, the defaults applied are equivalent to
 
 example(zle_highlight=LPAR()region:standout special:standout
-suffix:bold isearch:underline+RPAR())
+suffix:bold isearch:underline paste:standout+RPAR())
 
 i.e. both the region and special characters are shown in standout mode.
 
diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c
index 0c28c0a2d..6facff429 100644
--- a/Src/Zle/zle_refresh.c
+++ b/Src/Zle/zle_refresh.c
@@ -372,7 +372,8 @@ zle_set_highlight(void)
 	region_highlights[1].atr = TXTUNDERLINE;
     if (!suffix_atr_on_set)
 	region_highlights[2].atr = TXTBOLDFACE;
-        /* paste defaults to 0 */
+    if (!paste_atr_on_set)
+	region_highlights[3].atr = TXTSTANDOUT;
 
     allocate_colour_buffer();
 }