summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Colascione <dancol@dancol.org>2014-04-27 16:26:42 -0700
committerDaniel Colascione <dancol@dancol.org>2014-04-27 16:26:42 -0700
commit196bfaecb0caffcdbb699694139a97148e90e227 (patch)
tree9780807277c7826451790e56e30e8af39e2f4ee1
parent8f25c2bc56c65825e59651522ceb7b4855eb8205 (diff)
downloademacs-196bfaecb0caffcdbb699694139a97148e90e227.tar.gz
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.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/xterm.el7
2 files changed, 11 insertions, 1 deletions
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)))