From 2f8165f415d157d5b8412b27950964b6a0280773 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 29 May 2014 12:38:01 -0400 Subject: [PATCH] * lisp/subr.el (sit-for): Don't run input-methods. Fixes: debbugs:15614 --- lisp/ChangeLog | 4 ++++ lisp/subr.el | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7cdd43bd19..962b954281 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-29 Stefan Monnier + + * subr.el (sit-for): Don't run input-methods (bug#15614). + 2014-05-28 Glenn Morris * cus-start.el: Fix some :version numbers. diff --git a/lisp/subr.el b/lisp/subr.el index 48cb33f098..0a95cebd1a 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2168,7 +2168,12 @@ floating point support." ;; 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 -- 2.20.1