diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/calc/calc.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 386118b51e..9293a66c39 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-21 Juri Linkov <[email protected]> + + * calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' + to nil. (Bug#10018) + 2011-11-21 Lars Magne Ingebrigtsen <[email protected]> * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation): diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 60a84bdff3..626d2462b4 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -1235,7 +1235,8 @@ Used by `calc-user-invocation'.") (glob (current-global-map)) (loc (current-local-map))) (or (input-pending-p) (message "%s" prompt)) - (let ((key (calc-read-key t))) + (let ((key (calc-read-key t)) + (input-method-function nil)) (calc-unread-command (cdr key)) (unwind-protect (progn |