From: Eli Zaretskii Date: Mon, 12 Feb 2001 18:52:02 +0000 (+0000) Subject: (set-input-method): Doc fix. X-Git-Tag: emacs-pretest-21.0.98~35 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bc4069113821a78941319568d0b0a1709e8606ef;p=emacs.git (set-input-method): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bcfa6aaa26c..36616476d63 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2001-02-12 Eli Zaretskii + + * international/mule-cmds.el (set-input-method): Doc fix. + 2001-02-12 Eric M. Ludlam * 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 diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 728d45440ba..f7f10428354 100644 --- 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