diff options
| author | Kenichi Handa | 2006-11-28 05:34:38 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-11-28 05:34:38 +0000 |
| commit | 6af33222af7d3d87ee313e92ca66b9e844fbcc36 (patch) | |
| tree | 6d7322fe9d67e85a97a1440ebcc9a11ef0251923 | |
| parent | c0fdfa7bf632fbdabe63a87c984ef1ceb6278f33 (diff) | |
| download | emacs-6af33222af7d3d87ee313e92ca66b9e844fbcc36.tar.gz emacs-6af33222af7d3d87ee313e92ca66b9e844fbcc36.zip | |
(quail-get-translations): Make
quail-current-key multibyte if not yet done.
| -rw-r--r-- | lisp/international/quail.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 17dd5013805..d0719117ee2 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el | |||
| @@ -2066,6 +2066,8 @@ minibuffer and the selected frame has no other windows)." | |||
| 2066 | 2066 | ||
| 2067 | (defun quail-get-translations () | 2067 | (defun quail-get-translations () |
| 2068 | "Return a string containing the current possible translations." | 2068 | "Return a string containing the current possible translations." |
| 2069 | (or (multibyte-string-p quail-current-key) | ||
| 2070 | (setq quail-current-key (string-to-multibyte quail-current-key))) | ||
| 2069 | (let ((map (quail-lookup-key quail-current-key nil t)) | 2071 | (let ((map (quail-lookup-key quail-current-key nil t)) |
| 2070 | (str (copy-sequence quail-current-key))) | 2072 | (str (copy-sequence quail-current-key))) |
| 2071 | (if quail-current-translations | 2073 | (if quail-current-translations |
| @@ -2074,7 +2076,7 @@ minibuffer and the selected frame has no other windows)." | |||
| 2074 | ;; Show the current key. | 2076 | ;; Show the current key. |
| 2075 | (let ((guidance (quail-guidance))) | 2077 | (let ((guidance (quail-guidance))) |
| 2076 | (if (listp guidance) | 2078 | (if (listp guidance) |
| 2077 | ;; We must replace thetyped key with the specified PROMPTKEY. | 2079 | ;; We must replace the typed key with the specified PROMPT-KEY. |
| 2078 | (dotimes (i (length str)) | 2080 | (dotimes (i (length str)) |
| 2079 | (let ((prompt-key (cdr (assoc (aref str i) guidance)))) | 2081 | (let ((prompt-key (cdr (assoc (aref str i) guidance)))) |
| 2080 | (if prompt-key | 2082 | (if prompt-key |