Mercurial > emacs

changeset 19653:431753f747ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(describe-input-method): Fix previous change. (read-multilingual-string): Likewise. (describe-language-environment): Prompt modified.
author Kenichi Handa <handa@m17n.org>
date Mon, 01 Sep 1997 10:44:31 +0000
parents c1b01ff226c4
children 4c0174fcf26c
files lisp/international/mule-cmds.el
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el	Mon Sep 01 07:45:39 1997 +0000
+++ b/lisp/international/mule-cmds.el	Mon Sep 01 10:44:31 1997 +0000
@@ -532,7 +532,7 @@
   (interactive
    (list (read-input-method-name
 	  "Describe input method (default, current choice): ")))
-  (if (symbolp input-method)
+  (if (and input-method (symbolp input-method))
       (setq input-method (symbol-name input-method)))
   (if (null input-method)
       (describe-current-input-method)
@@ -565,12 +565,9 @@
 	(or input-method
 	    default-input-method
 	    (read-input-method-name "Input method: " nil t)))
-  (if (symbolp input-method)
+  (if (and input-method (symbolp input-method)
       (setq input-method (symbol-name input-method)))
-  (let ((current-input-method
-	 (or input-method
-	     default-input-method
-	     (read-input-method-name "Input method: " nil t))))
+  (let ((current-input-method input-method))
     (read-string prompt initial-input nil nil t)))
 
 ;; Variables to control behavior of input methods.  All input methods
@@ -667,7 +664,10 @@
 
 (defun describe-language-environment (language-name)
   "Describe how Emacs supports language environment LANGUAGE-NAME."
-  (interactive (list (read-language-name 'documentation "Language: ")))
+  (interactive
+   (list (read-language-name
+	  'documentation
+	  "Describe language environment (default, current choise): ")))
   (if (null language-name)
       (setq language-name current-language-environment))
   (if (or (null language-name)