(inactivate-input-method): Set

input-method-function to nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59f13a59b0073e6cce1b512ad956bfa2f59afe69..426eb6bceb97e6f6d9710209ccde837b7f7c0529 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-31  Gerd Moellmann  <gerd@gnu.org>
+
+       * international/mule-cmds.el (inactivate-input-method): Set
+       input-method-function to nil.
+
 2001-05-29  Sam Steingold  <sds@gnu.org>
 
        * faces.el (face-valid-attribute-values): Bind `valid' directly

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8df321af123d113ea0da33b556b0189c13aa9e95..2d95a531bd53a338da8c4c3d3421eed48dba40ff 100644 (file)
--- 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."
       (unwind-protect
          (run-hooks 'input-method-inactivate-hook)
        (setq current-input-method nil
+             input-method-function nil
              current-input-method-title nil)
        (force-mode-line-update)))))