# HG changeset patch # User Kenichi Handa # Date 1188881914 0 # Node ID a4a3332d65836b0735655ea78b04415e4e5ba99d # Parent b83d0dadb2a72c19540949e9bc59a7694611cb67 (inactivate-input-method): Set input-method-function to nil before calling inactivate-current-input-method-function. diff -r b83d0dadb2a7 -r a4a3332d6583 lisp/international/mule-cmds.el --- 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)