(set-input-method): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcfa6aaa26cfef71b59e876eca6b32000a61eb15..36616476d63d7fe7c77bb2ad2a4f967b46f58b8b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-12  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * international/mule-cmds.el (set-input-method): Doc fix.
+
 2001-02-12  Eric M. Ludlam  <zappo@choochoo.ultranet.com>
 
        * speedbar.el (speedbar-frame-parameters): No toolbar lines.
@@ -8,7 +12,7 @@
        
        * ediff-diff.el (ediff-make-diff2-buffer): Removed bogus checks
        for remote files.
-       (ediff-coding-system-for-read): replaced the no-conversion default
+       (ediff-coding-system-for-read): Replaced the no-conversion default
        with raw-text.
        
        * ediff-init.el: Removed :version from defcustom vars.
@@ -18,7 +22,7 @@
        
        * ediff.texi: Added ediff-coding-system-for-read.
        
-       * viper.texi: Typos
+       * viper.texi: Fix typos.
        
 2001-02-11  Dave Love  <fx@gnu.org>
 

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 728d45440baf571660280020dc5b6a58a70ca0ef..f7f104283543aebf7c7d3cf7402ec2f4a5d4dd7e 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1079,7 +1079,9 @@ If INPUT-METHOD is nil, deactivate any current input method."
 
 (defun set-input-method (input-method)
   "Select and activate input method INPUT-METHOD for the current buffer.
-This also sets the default input method to the one you specify."
+This also sets the default input method to the one you specify.
+To deactivate the input method interactively, use \\[toggle-input-method].
+To deactivate it programmatically, use \\[inactivate-input-method]."
   (interactive
    (let* ((default (or (car input-method-history) default-input-method)))
      (list (read-input-method-name