[Emacs-diffs] /srv/bzr/emacs/trunk r100608: * lisp/facemenu.el (list-colors-display): Call `pop-to-buffer' before

[Juri Linkov]

------------------------------------------------------------
revno: 100608
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2010-06-17 00:33:54 +0300
message:
  * lisp/facemenu.el (list-colors-display): Call `pop-to-buffer' before
  `list-colors-print'.  (Bug#6332)
modified:
  lisp/ChangeLog
  lisp/facemenu.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-16 21:11:06 +0000
+++ b/lisp/ChangeLog    2010-06-16 21:33:54 +0000
@@ -1,3 +1,8 @@
+2010-06-16  Juri Linkov  <address@hidden>
+
+       * facemenu.el (list-colors-display): Call `pop-to-buffer' before
+       `list-colors-print'.  (Bug#6332)
+
 2010-06-16  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/macroexp.el (macroexpand-all-1): Don't handle `lambda'

=== modified file 'lisp/facemenu.el'
--- a/lisp/facemenu.el  2010-06-15 11:05:06 +0000
+++ b/lisp/facemenu.el  2010-06-16 21:33:54 +0000
@@ -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.")))