# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1205355512 0
# Node ID a7f3b0c8e4a5674cb779f6ad401fc5f2fc5606ad
# Parent  b8de2f698e11e5e6ee9a572f3da68f88f05e8ca7
(quail-setup-completion-buf): Use set-buffer-multibyte rather than
setting default-enable-multibyte-characters.

diff -r b8de2f698e11 -r a7f3b0c8e4a5 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 12 20:53:46 2008 +0000
+++ b/lisp/ChangeLog	Wed Mar 12 20:58:32 2008 +0000
@@ -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 -r b8de2f698e11 -r a7f3b0c8e4a5 lisp/international/quail.el
--- a/lisp/international/quail.el	Wed Mar 12 20:53:46 2008 +0000
+++ b/lisp/international/quail.el	Wed Mar 12 20:58:32 2008 +0000
@@ -1927,12 +1927,13 @@
 (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 @@
 	      (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 @@
 ;;
 (provide 'quail)
 
-;;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
+;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886
 ;;; quail.el ends here