aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-06-05 17:21:37 +0000
committerRichard M. Stallman2006-06-05 17:21:37 +0000
commit43c58260f6255240f0344774eca8fbd008eefa15 (patch)
tree63339a7a1331fde0d7788901525d5913a5e9e178
parent58ce5535fd79ab1d48153eb82b7a0963b6aa20f1 (diff)
downloademacs-43c58260f6255240f0344774eca8fbd008eefa15.tar.gz
emacs-43c58260f6255240f0344774eca8fbd008eefa15.zip
(defined-colors): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cf001f1196..2d05ef1ac07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-06-05 Richard Stallman <rms@gnu.org>
2
3 * faces.el (defined-colors): Doc fix.
4
12006-06-05 Thien-Thi Nguyen <ttn@gnu.org> 52006-06-05 Thien-Thi Nguyen <ttn@gnu.org>
2 6
3 * vc.el (vc-process-filter): Inhibit undo 7 * vc.el (vc-process-filter): Inhibit undo
diff --git a/lisp/faces.el b/lisp/faces.el
index 14c57ed6e34..b2ca6dcce32 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1517,7 +1517,8 @@ If there is neither a user setting nor a default for FACE, return nil."
1517 "Return a list of colors supported for a particular frame. 1517 "Return a list of colors supported for a particular frame.
1518The argument FRAME specifies which frame to try. 1518The argument FRAME specifies which frame to try.
1519The value may be different for frames on different display types. 1519The value may be different for frames on different display types.
1520If FRAME doesn't support colors, the value is nil." 1520If FRAME doesn't support colors, the value is nil.
1521If FRAME is nil, that stands for the selected frame."
1521 (if (memq (framep (or frame (selected-frame))) '(x w32 mac)) 1522 (if (memq (framep (or frame (selected-frame))) '(x w32 mac))
1522 (xw-defined-colors frame) 1523 (xw-defined-colors frame)
1523 (mapcar 'car (tty-color-alist frame)))) 1524 (mapcar 'car (tty-color-alist frame))))