diff options
| author | Kenichi Handa | 1997-09-01 10:44:31 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1997-09-01 10:44:31 +0000 |
| commit | 787549348d7964565a262544d98d84a5a7733ab2 (patch) | |
| tree | f49df75812175e13d169a03cbedc3d868f1d2002 | |
| parent | 3c48e39a2aeb6693c6a2f449c362d52cf6e83364 (diff) | |
| download | emacs-787549348d7964565a262544d98d84a5a7733ab2.tar.gz emacs-787549348d7964565a262544d98d84a5a7733ab2.zip | |
(describe-input-method): Fix previous
change.
(read-multilingual-string): Likewise.
(describe-language-environment): Prompt modified.
| -rw-r--r-- | lisp/international/mule-cmds.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index dfc3a686e22..376e9726e4b 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el | |||
| @@ -532,7 +532,7 @@ When there's no input method to turn on, turn on what read from minibuffer." | |||
| 532 | (interactive | 532 | (interactive |
| 533 | (list (read-input-method-name | 533 | (list (read-input-method-name |
| 534 | "Describe input method (default, current choice): "))) | 534 | "Describe input method (default, current choice): "))) |
| 535 | (if (symbolp input-method) | 535 | (if (and input-method (symbolp input-method)) |
| 536 | (setq input-method (symbol-name input-method))) | 536 | (setq input-method (symbol-name input-method))) |
| 537 | (if (null input-method) | 537 | (if (null input-method) |
| 538 | (describe-current-input-method) | 538 | (describe-current-input-method) |
| @@ -565,12 +565,9 @@ or a string." | |||
| 565 | (or input-method | 565 | (or input-method |
| 566 | default-input-method | 566 | default-input-method |
| 567 | (read-input-method-name "Input method: " nil t))) | 567 | (read-input-method-name "Input method: " nil t))) |
| 568 | (if (symbolp input-method) | 568 | (if (and input-method (symbolp input-method) |
| 569 | (setq input-method (symbol-name input-method))) | 569 | (setq input-method (symbol-name input-method))) |
| 570 | (let ((current-input-method | 570 | (let ((current-input-method input-method)) |
| 571 | (or input-method | ||
| 572 | default-input-method | ||
| 573 | (read-input-method-name "Input method: " nil t)))) | ||
| 574 | (read-string prompt initial-input nil nil t))) | 571 | (read-string prompt initial-input nil nil t))) |
| 575 | 572 | ||
| 576 | ;; Variables to control behavior of input methods. All input methods | 573 | ;; Variables to control behavior of input methods. All input methods |
| @@ -667,7 +664,10 @@ and sometimes other things." | |||
| 667 | 664 | ||
| 668 | (defun describe-language-environment (language-name) | 665 | (defun describe-language-environment (language-name) |
| 669 | "Describe how Emacs supports language environment LANGUAGE-NAME." | 666 | "Describe how Emacs supports language environment LANGUAGE-NAME." |
| 670 | (interactive (list (read-language-name 'documentation "Language: "))) | 667 | (interactive |
| 668 | (list (read-language-name | ||
| 669 | 'documentation | ||
| 670 | "Describe language environment (default, current choise): "))) | ||
| 671 | (if (null language-name) | 671 | (if (null language-name) |
| 672 | (setq language-name current-language-environment)) | 672 | (setq language-name current-language-environment)) |
| 673 | (if (or (null language-name) | 673 | (if (or (null language-name) |