diff options
| author | Daniel Colascione | 2014-04-27 16:26:42 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2014-04-27 16:26:42 -0700 |
| commit | 196bfaecb0caffcdbb699694139a97148e90e227 (patch) | |
| tree | 9780807277c7826451790e56e30e8af39e2f4ee1 | |
| parent | 8f25c2bc56c65825e59651522ceb7b4855eb8205 (diff) | |
| download | emacs-196bfaecb0caffcdbb699694139a97148e90e227.tar.gz emacs-196bfaecb0caffcdbb699694139a97148e90e227.zip | |
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/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 7 |
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 @@ | |||
| 1 | 2014-04-27 Daniel Colascione <dancol@dancol.org> | ||
| 2 | |||
| 3 | * term/xterm.el (xterm-paste): Use large finite timeout when | ||
| 4 | reading event to avoid putting keys in this-command-keys. | ||
| 5 | |||
| 1 | 2014-04-25 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-04-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * progmodes/perl-mode.el (perl--syntax-exp-intro-regexp): New var. | 8 | * 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: | |||
| 59 | (while (not (search-backward | 59 | (while (not (search-backward |
| 60 | xterm-paste-ending-sequence | 60 | xterm-paste-ending-sequence |
| 61 | (- (point) end-marker-length) t)) | 61 | (- (point) end-marker-length) t)) |
| 62 | (let ((event (read-event))) | 62 | (let ((event (read-event |
| 63 | nil nil | ||
| 64 | ;; Use finite timeout to avoid | ||
| 65 | ;; glomming the event onto | ||
| 66 | ;; this-command-keys. | ||
| 67 | most-positive-fixnum))) | ||
| 63 | (when (eql event ?\r) | 68 | (when (eql event ?\r) |
| 64 | (setf event ?\n)) | 69 | (setf event ?\n)) |
| 65 | (insert event))) | 70 | (insert event))) |