changeset 109013:d94083f6e4e9

* lisp/facemenu.el (list-colors-display): Call `pop-to-buffer' before `list-colors-print'. (Bug#6332)
author Juri Linkov <juri@jurta.org>
date Thu, 17 Jun 2010 00:33:54 +0300
parents 421f2b1cd824
children 8020ce418135 ff42e5c5f789
files lisp/ChangeLog lisp/facemenu.el
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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'
--- 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.")))