From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 5 Jun 2006 17:21:37 +0000 (+0000)
Subject: (defined-colors): Doc fix.
X-Git-Tag: emacs-pretest-22.0.90~2063
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43c58260f6255240f0344774eca8fbd008eefa15;p=emacs.git

(defined-colors): Doc fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cf001f1196..2d05ef1ac07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-05  Richard Stallman  <rms@gnu.org>
+
+	* faces.el (defined-colors): Doc fix.
+
 2006-06-05  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* 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."
   "Return a list of colors supported for a particular frame.
 The argument FRAME specifies which frame to try.
 The value may be different for frames on different display types.
-If FRAME doesn't support colors, the value is nil."
+If FRAME doesn't support colors, the value is nil.
+If FRAME is nil, that stands for the selected frame."
   (if (memq (framep (or frame (selected-frame))) '(x w32 mac))
       (xw-defined-colors frame)
     (mapcar 'car (tty-color-alist frame))))