From: Daniel Colascione <dancol@dancol.org>
Date: Sun, 27 Apr 2014 23:26:42 +0000 (-0700)
Subject: Avoid adding bracketed paste keys to command keys
X-Git-Tag: emacs-25.0.90~2612^2~709^2~1012
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=196bfaecb0caffcdbb699694139a97148e90e227;p=emacs.git

Avoid adding bracketed paste keys to command keys

* lisp/term/xterm.el (xterm-paste): Use large finite timeout when
reading event to avoid putting keys in this-command-keys.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da8314cf617..3bbd2a8dc66 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-27  Daniel Colascione  <dancol@dancol.org>
+
+	* term/xterm.el (xterm-paste): Use large finite timeout when
+	reading event to avoid putting keys in this-command-keys.
+
 2014-04-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/perl-mode.el (perl--syntax-exp-intro-regexp): New var.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index f8ff0cc91dc..ed975c580c9 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -59,7 +59,12 @@ The relevant features are:
                         (while (not (search-backward
                                      xterm-paste-ending-sequence
                                      (- (point) end-marker-length) t))
-                          (let ((event (read-event)))
+                          (let ((event (read-event
+                                        nil nil
+                                        ;; Use finite timeout to avoid
+                                        ;; glomming the event onto
+                                        ;; this-command-keys.
+                                        most-positive-fixnum)))
                             (when (eql event ?\r)
                               (setf event ?\n))
                             (insert event)))