diff options
| author | Juri Linkov <juri@jurta.org> | 2011-11-22 01:59:09 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-11-22 01:59:09 +0200 |
| commit | f2a0aa3ae931cb4566792457de9392f374d1dbc6 (patch) | |
| tree | a3723874e0da7dce00745f9fedc29d3be326d860 /lisp | |
| parent | 252f26e9c26990ef9da51513b45b5eb806dd3ed7 (diff) | |
| download | emacs-f2a0aa3ae931cb4566792457de9392f374d1dbc6.tar.gz | |
* lisp/calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' to nil.
Fixes: debbugs:10018
Diffstat (limited to 'lisp')
| -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 386118b51eb..9293a66c394 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-21 Juri Linkov <juri@jurta.org> + + * calc/calc.el (calc-read-key-sequence): Let-bind `input-method-function' + to nil. (Bug#10018) + 2011-11-21 Lars Magne Ingebrigtsen <larsi@gnus.org> * emacs-lisp/cl-indent.el (common-lisp-loop-part-indentation): diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 60a84bdff35..626d2462b4f 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 |