procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
activating INPUT-METHOD, respect that value.
This commit is contained in:
Kenichi Handa 2001-03-05 11:28:47 +00:00
parent 10ebaeb674
commit 278dd6ac28
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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'.

4
lisp/international/mule-cmds.el
View file

@ -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)))))