aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 bd751955833..8a94e82b108 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -341,7 +341,7 @@ Each function is called with one arg, LEIM directory name.")
341 341
342(defvar current-input-method nil 342(defvar current-input-method nil
343 "The current input method for multilingual text. 343 "The current input method for multilingual text.
344If nil, it means no input method is activated now.") 344If nil, that means no input method is activated now.")
345(make-variable-buffer-local 'current-input-method) 345(make-variable-buffer-local 'current-input-method)
346(put 'current-input-method 'permanent-local t) 346(put 'current-input-method 'permanent-local t)
347 347
@@ -443,8 +443,8 @@ If INHIBIT-NULL is non-nil, null input signals an error."
443 443
444(defun select-input-method (input-method) 444(defun select-input-method (input-method)
445 "Select and activate INPUT-METHOD. 445 "Select and activate INPUT-METHOD.
446Both the default and local values of default-input-method are 446This sets both the default and local values of `default-input-method'
447set to the selected input method. 447to the input method you specify.
448See also the function `register-input-method'." 448See also the function `register-input-method'."
449 (interactive 449 (interactive
450 (let* ((default (or previous-input-method default-input-method)) 450 (let* ((default (or previous-input-method default-input-method))
@@ -459,7 +459,7 @@ See also the function `register-input-method'."
459 "Turn on or off a multilingual text input method for the current buffer. 459 "Turn on or off a multilingual text input method for the current buffer.
460With arg, read an input method from minibuffer and turn it on. 460With arg, read an input method from minibuffer and turn it on.
461Without arg, if some input method is currently activated, turn it off, 461Without arg, if some input method is currently activated, turn it off,
462else turn on default-input-method (which see). 462else turn on the default input method (see `default-input-method').
463In the latter case, if default-input-method is nil, select an input method 463In the latter case, if default-input-method is nil, select an input method
464interactively." 464interactively."
465 (interactive "P") 465 (interactive "P")
@@ -468,7 +468,7 @@ interactively."
468 (if (and current-input-method (not arg)) 468 (if (and current-input-method (not arg))
469 (inactivate-input-method) 469 (inactivate-input-method)
470 (if (not enable-multibyte-characters) 470 (if (not enable-multibyte-characters)
471 (error "Can't activate any input method while enable-multibyte-characters is nil")) 471 (error "Can't activate any input method while multibyte characters are disabled"))
472 (activate-input-method 472 (activate-input-method
473 (if (or arg (not default-input-method)) 473 (if (or arg (not default-input-method))
474 (read-input-method-name "Input method: " initial t) 474 (read-input-method-name "Input method: " initial t)
@@ -487,7 +487,7 @@ interactively."
487 input-method (nth 3 elt) (nth 1 elt) (nth 4 elt))))))) 487 input-method (nth 3 elt) (nth 1 elt) (nth 4 elt)))))))
488 488
489(defun describe-current-input-method () 489(defun describe-current-input-method ()
490 "Describe the input method currently turned on." 490 "Describe the input method currently in use."
491 (if current-input-method 491 (if current-input-method
492 (if (and (symbolp describe-current-input-method-function) 492 (if (and (symbolp describe-current-input-method-function)
493 (fboundp describe-current-input-method-function)) 493 (fboundp describe-current-input-method-function))
@@ -573,7 +573,7 @@ and sometimes other things."
573;; [menu-bar mule describe-language-environment LANGUAGE] 573;; [menu-bar mule describe-language-environment LANGUAGE]
574;; and should not run it by `M-x describe-current-input-method-function'. 574;; and should not run it by `M-x describe-current-input-method-function'.
575(defun describe-specified-language-support () 575(defun describe-specified-language-support ()
576 "Describe how Emacs supports the specified langugage." 576 "Describe how Emacs supports the specified language environment."
577 (interactive) 577 (interactive)
578 (let (language-name) 578 (let (language-name)
579 (if (not (and (symbolp last-command-event) 579 (if (not (and (symbolp last-command-event)
@@ -634,7 +634,7 @@ and sometimes other things."
634(defsubst get-charset-property (charset propname) 634(defsubst get-charset-property (charset propname)
635 "Return the value of CHARSET's PROPNAME property. 635 "Return the value of CHARSET's PROPNAME property.
636This is the last value stored with 636This is the last value stored with
637`(put-charset-property CHARSET PROPNAME VALUE)'." 637 (put-charset-property CHARSET PROPNAME VALUE)."
638 (plist-get (charset-plist charset) propname)) 638 (plist-get (charset-plist charset) propname))
639 639
640(defsubst put-charset-property (charset propname value) 640(defsubst put-charset-property (charset propname value)
@@ -651,7 +651,7 @@ It can be retrieved with `(get-charset-property CHARSET PROPNAME)'."
651 "Char-table containing a property list of each character code. 651 "Char-table containing a property list of each character code.
652 652
653See also the documentation of `get-char-code-property' and 653See also the documentation of `get-char-code-property' and
654`put-char-code-property'") 654`put-char-code-property'.")
655 655
656(defun get-char-code-property (char propname) 656(defun get-char-code-property (char propname)
657 "Return the value of CHAR's PROPNAME property in `char-code-property-table'." 657 "Return the value of CHAR's PROPNAME property in `char-code-property-table'."