Mercurial > emacs

changeset 91016:a4a3332d6583

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(inactivate-input-method): Set input-method-function to nil before calling inactivate-current-input-method-function.
author Kenichi Handa <handa@m17n.org>
date Tue, 04 Sep 2007 04:58:34 +0000
parents b83d0dadb2a7
children d08918d380dc
files lisp/international/mule-cmds.el
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el	Wed Aug 29 05:03:40 2007 +0000
+++ b/lisp/international/mule-cmds.el	Tue Sep 04 04:58:34 2007 +0000
@@ -1427,12 +1427,13 @@
 		      (delete current-input-method input-method-history))))
       (setq input-method-history (list current-input-method)))
     (unwind-protect
-	(funcall inactivate-current-input-method-function)
+	(progn
+	  (setq input-method-function nil
+		current-input-method-title nil)
+	  (funcall inactivate-current-input-method-function))
       (unwind-protect
 	  (run-hooks 'input-method-inactivate-hook)
-	(setq current-input-method nil
-	      input-method-function nil
-	      current-input-method-title nil)
+	(setq current-input-method nil)
 	(force-mode-line-update)))))
 
 (defun set-input-method (input-method &optional interactive)