[Emacs-diffs] Changes to emacs/lisp/international/quail.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/12 20:58:33

Index: international/quail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/quail.el,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -b -r1.160 -r1.161
--- international/quail.el      1 Feb 2008 16:01:20 -0000       1.160
+++ international/quail.el      12 Mar 2008 20:58:01 -0000      1.161
@@ -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*")))
+    (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 1 1))
-      (overlay-put quail-overlay 'face 'highlight))))
+        (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