Mercurial > emacs
changeset 36528:355bbea5a6cd
(activate-input-method): If current-input-method-title is set by
activating INPUT-METHOD, respect that value.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 05 Mar 2001 11:27:20 +0000 |
| parents | a21a2f14a765 |
| children | 1d2207455353 |
| files | lisp/international/mule-cmds.el |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)))))