* lisp/facemenu.el (list-colors-display): Call `pop-to-buffer' before

`list-colors-print'.  (Bug#6332)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18c99d4ebf06b27d1be304537b88f0585773f99e..b59e5f2708cbf0e7b9a2a86cede652ba55f558e6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-16  Juri Linkov  <juri@jurta.org>
+
+       * facemenu.el (list-colors-display): Call `pop-to-buffer' before
+       `list-colors-print'.  (Bug#6332)
+
 2010-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/macroexp.el (macroexpand-all-1): Don't handle `lambda'

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 19b5967215a2dc505ce68225bc8e068150e298a1..20b86676ea94ad3fffb34c0ce1652956b925a9ff 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -600,9 +600,11 @@ You can change the color sort order by customizing `list-colors-sort'."
     (with-current-buffer buf
       (erase-buffer)
       (setq truncate-lines t)
+      ;; Display buffer before generating content to allow
+      ;; `list-colors-print' to get the right window-width.
+      (pop-to-buffer buf)
       (list-colors-print list callback)
-      (set-buffer-modified-p nil))
-    (pop-to-buffer buf))
+      (set-buffer-modified-p nil)))
   (if callback
       (message "Click on a color to select it.")))