(quail-start-translation): If

enable-multibyte-characters is nil, convert multibyte character to
unibyte.
(quail-start-conversion): Likewise.

1 files changed, 9 insertions, 5 deletions

diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 87b0ce350d4..8dae9fb627a 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -948,10 +948,11 @@ The returned value is a Quail map specific to KEY."
         (quail-delete-region)
         (if (and quail-current-str (> (length quail-current-str) 0))
             (setq generated-events
-                  (if (stringp quail-current-str)
-                      (append (string-to-list quail-current-str)
-                              generated-events)
-                    (cons quail-current-str generated-events))))
+                  (append (string-to-list
+                           (if enable-multibyte-characters
+                               quail-current-str
+                             (string-make-unibyte quail-current-str)))
+                          generated-events)))
         (if (and input-method-exit-on-first-char generated-events)
             (list (car generated-events))
           generated-events))
@@ -1023,7 +1024,10 @@ The returned value is a Quail map specific to KEY."
                            (overlay-end quail-conv-overlay)))
         (if (> (length quail-conversion-str) 0)
             (setq generated-events
-                  (append (string-to-list quail-conversion-str)
+                  (append (string-to-list
+                           (if enable-multibyte-characters
+                               quail-conversion-str
+                             (string-make-unibyte quail-conversion-str)))
                           generated-events)))
         (if (and input-method-exit-on-first-char generated-events)
             (list (car generated-events))