aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa1999-06-17 12:11:46 +0000
committerKenichi Handa1999-06-17 12:11:46 +0000
commitf2979bdbdcf259338fd568c1adbfabb6b021ce81 (patch)
tree6fd4f0a043492e920826551f8dc6dd4dd2b22326
parentdaffac2fba8ad81e6c64a925bcce71c278df4f4f (diff)
downloademacs-f2979bdbdcf259338fd568c1adbfabb6b021ce81.tar.gz
emacs-f2979bdbdcf259338fd568c1adbfabb6b021ce81.zip
(describe-current-input-method):
Current-input-method is string. (toggle-input-method): Docstring fixed.
-rw-r--r--lisp/international/mule-cmds.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5cffcd5b1aa..bdea029229e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -952,16 +952,16 @@ This also sets the default input method to the one you specify."
952(defun toggle-input-method (&optional arg) 952(defun toggle-input-method (&optional arg)
953 "Turn on or off a multilingual text input method for the current buffer. 953 "Turn on or off a multilingual text input method for the current buffer.
954 954
955With no prefix argument, if some input method is currently activated, 955With no prefix argument, if an input method is currently activated,
956turn it off. Otherwise, activate an input method--the one most recently used, 956turn it off. Otherwise, activate an input method -- the one most
957or the one specified in `default-input-method', or one read from the 957recently used, or the one specified in `default-input-method', or
958minibuffer. 958the one read from the minibuffer.
959 959
960With a prefix arg, read an input method from minibuffer and turn it on. 960With a prefix argument, read an input method from the minibuffer and
961The default is the most recent input method specified 961turn it on.
962\(not including the currently active input method, if any).
963 962
964When there's no input method to turn on, turn on what read from minibuffer." 963The default is to use the most recent input method specified
964\(not including the currently active input method, if any)."
965 (interactive "P") 965 (interactive "P")
966 (if (and current-input-method (not arg)) 966 (if (and current-input-method (not arg))
967 (inactivate-input-method) 967 (inactivate-input-method)
@@ -1000,7 +1000,7 @@ When there's no input method to turn on, turn on what read from minibuffer."
1000 (fboundp describe-current-input-method-function)) 1000 (fboundp describe-current-input-method-function))
1001 (funcall describe-current-input-method-function) 1001 (funcall describe-current-input-method-function)
1002 (message "No way to describe the current input method `%s'" 1002 (message "No way to describe the current input method `%s'"
1003 (cdr current-input-method)) 1003 current-input-method)
1004 (ding)) 1004 (ding))
1005 (error "No input method is activated now"))) 1005 (error "No input method is activated now")))
1006 1006