(activate-input-method): If current-input-method-title is set by

activating INPUT-METHOD, respect that value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d55f43116f21753b20f241c490a9b08c4115c2a..47b890b69f5b10ff65d499d1b20dff5b4e8ab543 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-05  Kenichi Handa  <handa@etl.go.jp>
+
+       * international/mule-cmds.el (activate-input-method): If
+       current-input-method-title is set by activating INPUT-METHOD,
+       respect that value.
+
 2001-03-05  Gerd Moellmann  <gerd@gnu.org>
 
        * play/dunnet.el (dun-mode): Set major-mode to `dun-mode'.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index ba8ecca8af0fd5d0656d1428b5832c8bb9280fad..2704bbc0b5d153260af49da75cd34dfc27bd560b 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1048,6 +1048,7 @@ If INPUT-METHOD is nil, deactivate any current input method."
     (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 @@ If INPUT-METHOD is nil, deactivate any current input method."
                (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)))))