# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1276724034 -10800
# Node ID d94083f6e4e980e1bf02cfa8b5924b6610592490
# Parent  421f2b1cd8245add99b9fdc03261dce717417bf0
* lisp/facemenu.el (list-colors-display): Call `pop-to-buffer' before
`list-colors-print'.  (Bug#6332)

diff -r 421f2b1cd824 -r d94083f6e4e9 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jun 16 17:11:06 2010 -0400
+++ b/lisp/ChangeLog	Thu Jun 17 00:33:54 2010 +0300
@@ -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 -r 421f2b1cd824 -r d94083f6e4e9 lisp/facemenu.el
--- a/lisp/facemenu.el	Wed Jun 16 17:11:06 2010 -0400
+++ b/lisp/facemenu.el	Thu Jun 17 00:33:54 2010 +0300
@@ -600,9 +600,11 @@
     (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.")))