* lisp/facemenu.el (list-colors-display): Use with-help-window (Bug#8048).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02e6c3c56ba94ae14519aa7968d6cc3a583c74b6..94ff6303901c9116baa97c565ed30249d61331da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * facemenu.el (list-colors-display): Use with-help-window (Bug#8048).
+
 2011-02-27  Prestoo Ten  <prestooten@gmail.com>
 
        * term/screen.el: New file (Bug#2650).

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 360383aa32bffe1d592ada39a723ecc556b9e385..97862afb6783986f2422659b1838006ca7524a51 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -562,17 +562,23 @@ You can change the color sort order by customizing `list-colors-sort'."
       (let ((lc (nthcdr (1- (display-color-cells)) list)))
        (if lc
            (setcdr lc nil)))))
-  (let ((buf (get-buffer-create "*Colors*")))
-    (with-current-buffer buf
+  (unless buffer-name
+    (setq buffer-name "*Colors*"))
+  (with-help-window buffer-name
+    (with-current-buffer standard-output
       (erase-buffer)
-      (setq truncate-lines t)
-      ;; Display buffer before generating content to allow
-      ;; `list-colors-print' to get the right window-width.
+      (setq truncate-lines t)))
+  (let ((buf (get-buffer buffer-name))
+       (inhibit-read-only t))
+    ;; Display buffer before generating content, to allow
+    ;; `list-colors-print' to get the right window-width.
+    (with-selected-window (or (get-buffer-window buf t) (selected-window))
+      (with-current-buffer buf
+       (list-colors-print list callback)
+       (set-buffer-modified-p nil)))
+    (when callback
       (pop-to-buffer buf)
-      (list-colors-print list callback)
-      (set-buffer-modified-p nil)))
-  (if callback
-      (message "Click on a color to select it.")))
+      (message "Click on a color to select it."))))
 
 (defun list-colors-print (list &optional callback)
   (let ((callback-fn