diff options
| author | Kenichi Handa <handa@m17n.org> | 2001-03-05 11:28:47 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2001-03-05 11:28:47 +0000 |
| commit | 278dd6ac281c40f2e004c92cc1a34a6cc9b7507c (patch) | |
| tree | 174d94812bbcfb62e78891fc3e2a848cd0cddab8 | |
| parent | 10ebaeb6742320957ec50c08d507c3873e98f52b (diff) | |
| download | emacs-278dd6ac281c40f2e004c92cc1a34a6cc9b7507c.tar.gz | |
(activate-input-method): If current-input-method-title is set by
activating INPUT-METHOD, respect that value.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3d55f43116f..47b890b69f5 100644 --- 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 ba8ecca8af0..2704bbc0b5d 100644 --- 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))))) |