From: Kenichi Handa <handa@m17n.org>
Date: Tue, 4 Sep 2007 04:58:34 +0000 (+0000)
Subject: (inactivate-input-method): Set
X-Git-Tag: emacs-pretest-23.0.90~8295^2~343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36f8618c5c4241c4f2ca6a13b7354cb61a523878;p=emacs.git

(inactivate-input-method): Set
input-method-function to nil before calling
inactivate-current-input-method-function.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index acff5057f72..71f8168558f 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1427,12 +1427,13 @@ If INPUT-METHOD is nil, deactivate any current input method."
 		      (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)