aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-02-13 20:03:38 +0000
committerEli Zaretskii2001-02-13 20:03:38 +0000
commit402dbbd1ec95527057805a0dfe219389e3a1d7eb (patch)
tree465bb16d4ff262916cbe515c5c5add0e123fc384
parent74ac26b2fc8ea8658bb12cd4863ff27c77d0bca2 (diff)
downloademacs-402dbbd1ec95527057805a0dfe219389e3a1d7eb.tar.gz
emacs-402dbbd1ec95527057805a0dfe219389e3a1d7eb.zip
(set-input-method): Another doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/mule-cmds.el4
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4e08229246..6d5fd52dc73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12001-02-13 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * international/mule-cmds.el (set-input-method): Another doc fix.
4
12001-02-13 David M. Koppelman <koppel@ee.lsu.edu> 52001-02-13 David M. Koppelman <koppel@ee.lsu.edu>
2 6
3 * hi-lock.el (hi-lock-find-patterns): Don't activate font-lock-mode. 7 * hi-lock.el (hi-lock-find-patterns): Don't activate font-lock-mode.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index f7f10428354..78d940c7ba3 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1080,6 +1080,10 @@ If INPUT-METHOD is nil, deactivate any current input method."
1080(defun set-input-method (input-method) 1080(defun set-input-method (input-method)
1081 "Select and activate input method INPUT-METHOD for the current buffer. 1081 "Select and activate input method INPUT-METHOD for the current buffer.
1082This also sets the default input method to the one you specify. 1082This also sets the default input method to the one you specify.
1083If INPUT-METHOD is nil, this function turns off the input method, and
1084also causes you to be prompted for a name of an input method the next
1085time you invoke \\[toggle-input-method].
1086
1083To deactivate the input method interactively, use \\[toggle-input-method]. 1087To deactivate the input method interactively, use \\[toggle-input-method].
1084To deactivate it programmatically, use \\[inactivate-input-method]." 1088To deactivate it programmatically, use \\[inactivate-input-method]."
1085 (interactive 1089 (interactive