aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa1999-10-26 13:01:20 +0000
committerKenichi Handa1999-10-26 13:01:20 +0000
commitbf294e6edb16faca4ec9c573f0b80853bee79952 (patch)
tree6117e9b5c7957361de79e1d0cb7aa3bde2715f39
parentd4b11c67a713b67bff569fda13f11b0e517d764e (diff)
downloademacs-bf294e6edb16faca4ec9c573f0b80853bee79952.tar.gz
emacs-bf294e6edb16faca4ec9c573f0b80853bee79952.zip
(read-input-method-name): Handle the
case that the arg DEFAULT is symbol.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/international/mule-cmds.el2
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 527304be32f..9e7354cae7f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
11999-10-26 Kenichi Handa <handa@etl.go.jp>
2
3 * international/mule-cmds.el (read-input-method-name): Handle the
4 case that the arg DEFAULT is symbol.
5
6 * international/mule-diag.el (mule-diag): Handle the case that
7 default-input-method is symbol.
8
11999-10-26 Gerd Moellmann <gerd@gnu.org> 91999-10-26 Gerd Moellmann <gerd@gnu.org>
2 10
3 * textmodes/tildify.el: New file. 11 * textmodes/tildify.el: New file.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 775b5808a11..1b35f86ef6a 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -892,6 +892,8 @@ The return value is a string."
892 (input-method (completing-read prompt input-method-alist 892 (input-method (completing-read prompt input-method-alist
893 nil t nil 'input-method-history 893 nil t nil 'input-method-history
894 default))) 894 default)))
895 (if (and input-method (symbolp input-method))
896 (setq input-method (symbol-name input-method)))
895 (if (> (length input-method) 0) 897 (if (> (length input-method) 0)
896 input-method 898 input-method
897 (if inhibit-null 899 (if inhibit-null