aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/facemenu.el11
2 files changed, 6 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 11515ad013e..50340b0d721 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-02-04 Glenn Morris <rgm@gnu.org> 12012-02-04 Glenn Morris <rgm@gnu.org>
2 2
3 * facemenu.el (list-colors-display): Doc fix (minor rephrasing).
4
3 * ido.el (ido-find-file): Doc fix (ido-toggle-vc not on any key). 5 * ido.el (ido-find-file): Doc fix (ido-toggle-vc not on any key).
4 6
52012-02-03 Glenn Morris <rgm@gnu.org> 72012-02-03 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index e5d14be15dd..743115839b2 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -519,17 +519,14 @@ filter out the color from the output."
519 "Display names of defined colors, and show what they look like. 519 "Display names of defined colors, and show what they look like.
520If the optional argument LIST is non-nil, it should be a list of 520If the optional argument LIST is non-nil, it should be a list of
521colors to display. Otherwise, this command computes a list of 521colors to display. Otherwise, this command computes a list of
522colors that the current display can handle. 522colors that the current display can handle. Customize
523`list-colors-sort' to change the order in which colors are shown.
523 524
524If the optional argument BUFFER-NAME is nil, it defaults to 525If the optional argument BUFFER-NAME is nil, it defaults to *Colors*.
525*Colors*.
526 526
527If the optional argument CALLBACK is non-nil, it should be a 527If the optional argument CALLBACK is non-nil, it should be a
528function to call each time the user types RET or clicks on a 528function to call each time the user types RET or clicks on a
529color. The function should accept a single argument, the color 529color. The function should accept a single argument, the color name."
530name.
531
532You can change the color sort order by customizing `list-colors-sort'."
533 (interactive) 530 (interactive)
534 (when (and (null list) (> (display-color-cells) 0)) 531 (when (and (null list) (> (display-color-cells) 0))
535 (setq list (list-colors-duplicates (defined-colors))) 532 (setq list (list-colors-duplicates (defined-colors)))