aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-05-31 07:59:18 +0000
committerGerd Moellmann2001-05-31 07:59:18 +0000
commit2b1ec9736b165a278c41ab441a262ca9ae727fba (patch)
treedd9a392adaad8897f482c2a7b619a196012c132d
parent8908cf40d577ecf63c5001fda2be3227979a134b (diff)
downloademacs-2b1ec9736b165a278c41ab441a262ca9ae727fba.tar.gz
emacs-2b1ec9736b165a278c41ab441a262ca9ae727fba.zip
(inactivate-input-method): Set
input-method-function to nil.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59f13a59b00..426eb6bceb9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12001-05-31 Gerd Moellmann <gerd@gnu.org>
2
3 * international/mule-cmds.el (inactivate-input-method): Set
4 input-method-function to nil.
5
12001-05-29 Sam Steingold <sds@gnu.org> 62001-05-29 Sam Steingold <sds@gnu.org>
2 7
3 * faces.el (face-valid-attribute-values): Bind `valid' directly 8 * faces.el (face-valid-attribute-values): Bind `valid' directly
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8df321af123..2d95a531bd5 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1082,6 +1082,7 @@ If INPUT-METHOD is nil, deactivate any current input method."
1082 (unwind-protect 1082 (unwind-protect
1083 (run-hooks 'input-method-inactivate-hook) 1083 (run-hooks 'input-method-inactivate-hook)
1084 (setq current-input-method nil 1084 (setq current-input-method nil
1085 input-method-function nil
1085 current-input-method-title nil) 1086 current-input-method-title nil)
1086 (force-mode-line-update))))) 1087 (force-mode-line-update)))))
1087 1088