# HG changeset patch # User Kenichi Handa # Date 983791640 0 # Node ID 355bbea5a6cda1c5c43d5b65982fda8037c4ba11 # Parent a21a2f14a765149ff1d093f24746477a751167fc (activate-input-method): If current-input-method-title is set by activating INPUT-METHOD, respect that value. diff -r a21a2f14a765 -r 355bbea5a6cd lisp/international/mule-cmds.el --- a/lisp/international/mule-cmds.el Mon Mar 05 10:42:09 2001 +0000 +++ b/lisp/international/mule-cmds.el Mon Mar 05 11:27:20 2001 +0000 @@ -1048,6 +1048,7 @@ (let ((slot (assoc input-method input-method-alist))) (if (null slot) (error "Can't activate input method `%s'" input-method)) + (setq current-input-method-title nil) (let ((func (nth 2 slot))) (if (functionp func) (apply (nth 2 slot) input-method (nthcdr 5 slot)) @@ -1057,7 +1058,8 @@ (apply (car func) input-method (nthcdr 5 slot))) (error "Can't activate input method `%s'" input-method)))) (setq current-input-method input-method) - (setq current-input-method-title (nth 3 slot)) + (or (stringp current-input-method-title) + (setq current-input-method-title (nth 3 slot))) (unwind-protect (run-hooks 'input-method-activate-hook) (force-mode-line-update)))))