about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Etc/FAQ.yo6
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 857bf1046..23f2b3b41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-17  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36186: Etc/FAQ.yo: FAQ (3.24): Update for bracketed paste
+
 2015-08-17  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 36172: Completion/Unix/Command/_imagemagick: Use $formats a
diff --git a/Etc/FAQ.yo b/Etc/FAQ.yo
index a9cc0a661..e6d509454 100644
--- a/Etc/FAQ.yo
+++ b/Etc/FAQ.yo
@@ -1702,11 +1702,17 @@ sect(What's wrong with cut and paste on my xterm?)
      already active, and needs to be turned off when the first command is
      executed.  The shell doesn't even know if the remaining text is input
      to a command or for the shell, so there's simply nothing it can do.
+
      However, if you have problems you can trick it: type `tt({)' on a line
      by itself, then paste the input, then type `tt(})' on a line by
      itself.  The shell will not execute anything until the final brace is
      read; all input is read as continuation lines (this may require the
      fixes referred to above in order to be reliable).
+
+     As of 5.0.9, this trick is not necessary on terminal emulators that
+     support the em(bracketed paste) feature (this includes most modern
+     terminal emulators).  See the description of tt($zle_bracketed_paste)
+     in the tt(zshparam) manual page for details.
   )