aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-09-13 09:38:27 +0000
committerRichard M. Stallman1997-09-13 09:38:27 +0000
commitcb29dfb6878a6fe422f6ac31b646400e69ab9572 (patch)
tree2674ecd8dae1d98ccda09399b3ab44354b686017
parentbe9778f8dec0000095275916fb9b262804948cf7 (diff)
downloademacs-cb29dfb6878a6fe422f6ac31b646400e69ab9572.tar.gz
emacs-cb29dfb6878a6fe422f6ac31b646400e69ab9572.zip
(select-input-method): No error if enable-multibyte-characters is nil.
(input-method-verbose-flag): Doc-string fixed.
-rw-r--r--lisp/international/mule-cmds.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index f79fdaf1799..f9e21bcd05d 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -495,8 +495,6 @@ This sets the default input method to what you specify,
495and turn it on for the current buffer." 495and turn it on for the current buffer."
496 (interactive 496 (interactive
497 (let* ((default (or (car input-method-history) default-input-method))) 497 (let* ((default (or (car input-method-history) default-input-method)))
498 (if (not enable-multibyte-characters)
499 (error "Can't activate an input method while multibyte characters are disabled"))
500 (list (read-input-method-name 498 (list (read-input-method-name
501 (if default "Select input method (default %s): " "Select input method: ") 499 (if default "Select input method (default %s): " "Select input method: ")
502 default t)))) 500 default t))))
@@ -575,12 +573,14 @@ or a string."
575(defcustom input-method-verbose-flag t 573(defcustom input-method-verbose-flag t
576 "*If this flag is non-nil, input methods give extra guidance. 574 "*If this flag is non-nil, input methods give extra guidance.
577 575
578The extra guidance is done by showing list of avairable keys in echo 576The extra guidance is done by showing list of available keys in echo
579area. 577area.
580 578
581If an input method is turned on in the minibuffer, the guidance is 579For complex input methods such as `chinese-py' and `japanese',
582shown at the bottom short window (by splitting the existing one) only 580when you use the input method in the minibuffer, the guidance is
583for such complex input methods as `chinese-py' and `japanese'." 581shown at the bottom short window (split from the existing window).
582For simple input methods, guidance is not shown
583when you are in the minibuffer."
584 :type 'boolean 584 :type 'boolean
585 :group 'mule) 585 :group 'mule)
586 586