(quail-setup-completion-buf): Use set-buffer-multibyte rather than

setting default-enable-multibyte-characters.

2 files changed, 10 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8019ce822a1..8737f2be0bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
 2008-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * international/quail.el (quail-setup-completion-buf):
         * mail/binhex.el (binhex-decode-region-internal):
         * mail/uudecode.el (uudecode-decode-region-internal):
         * net/dns.el (dns-read-string-name, dns-read, dns-read-type, query-dns):
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 42fe5338eb3..0c8d5e4bff4 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1927,12 +1927,13 @@ Remaining args are for FUNC."
 (defun quail-setup-completion-buf ()
   "Setup Quail completion buffer."
   (unless (buffer-live-p quail-completion-buf)
-    (let ((default-enable-multibyte-characters enable-multibyte-characters))
-      (setq quail-completion-buf (get-buffer-create "*Quail Completions*")))
-    (with-current-buffer quail-completion-buf
-      (setq buffer-read-only t)
-      (setq quail-overlay (make-overlay 1 1))
-      (overlay-put quail-overlay 'face 'highlight))))
+    (let ((mb enable-multibyte-characters))
+      (setq quail-completion-buf (get-buffer-create "*Quail Completions*"))
+      (with-current-buffer quail-completion-buf
+        (set-buffer-multibyte mb)
+        (setq buffer-read-only t)
+        (setq quail-overlay (make-overlay (point-min) (point-min)))
+        (overlay-put quail-overlay 'face 'highlight)))))
 
 (defun quail-require-guidance-buf ()
   "Return t if the current Quail package requires showing guidance buffer."
@@ -1986,8 +1987,7 @@ minibuffer and the selected frame has no other windows)."
               (or (buffer-live-p quail-guidance-buf)
                   (setq quail-guidance-buf
                         (get-buffer-create " *Quail-guidance*")))
-              (save-excursion
-                (set-buffer quail-guidance-buf)
+              (with-current-buffer quail-guidance-buf
                 (erase-buffer)
                 (setq cursor-type nil)
                 (insert guidance))
@@ -3042,5 +3042,5 @@ call it with one argument STRING."
 ;;
 (provide 'quail)
 
-;;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
+;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
 ;;; quail.el ends here