[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117170: * lisp/subr.el (sit-for): Don't run inpu
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] emacs-24 r117170: * lisp/subr.el (sit-for): Don't run input-methods. |
Date: |
Thu, 29 May 2014 16:38:08 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117170
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15614
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-05-29 12:38:01 -0400
message:
* lisp/subr.el (sit-for): Don't run input-methods.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/subr.el subr.el-20091113204419-o5vbwnq5f7feedwu-151
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-28 15:48:39 +0000
+++ b/lisp/ChangeLog 2014-05-29 16:38:01 +0000
@@ -1,3 +1,7 @@
+2014-05-29 Stefan Monnier <address@hidden>
+
+ * subr.el (sit-for): Don't run input-methods (bug#15614).
+
2014-05-28 Glenn Morris <address@hidden>
* cus-start.el: Fix some :version numbers.
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2014-05-09 16:51:17 +0000
+++ b/lisp/subr.el 2014-05-29 16:38:01 +0000
@@ -2168,7 +2168,12 @@
;; FIXME: we should not read-event here at all, because it's much too
;; difficult to reliably "undo" a read-event by pushing it onto
;; unread-command-events.
- (let ((read (read-event nil t seconds)))
+ ;; For bug#14782, we need read-event to do the keyboard-coding-system
+ ;; decoding (hence non-nil as second arg under POSIX ttys).
+ ;; For bug#15614, we need read-event not to inherit-input-method.
+ ;; So we temporarily suspend input-method-function.
+ (let ((read (let ((input-method-function nil))
+ (read-event nil t seconds))))
(or (null read)
(progn
;; If last command was a prefix arg, e.g. C-u, push this event onto
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117170: * lisp/subr.el (sit-for): Don't run input-methods.,
Stefan Monnier <=