# HG changeset patch
# User Jan D <jan.h.d@swipnet.se>
# Date 1280596876 -7200
# Node ID ec823851a46c0a7b8987a6d7483172db88425c30
# Parent  d141353cef63e79763b84cbd7e74bfe031f19c70
* faces.el (face-all-attributes): Improved documentation (Bug#6767).

diff -r d141353cef63 -r ec823851a46c lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 31 20:13:03 2010 +0300
+++ b/lisp/ChangeLog	Sat Jul 31 19:21:16 2010 +0200
@@ -1,3 +1,7 @@
+2010-07-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* faces.el (face-all-attributes): Improved documentation (Bug#6767).
+
 2010-07-31  Eli Zaretskii  <eliz@gnu.org>
 
 	* files.el (bidi-paragraph-direction): Define safe local values.
diff -r d141353cef63 -r ec823851a46c lisp/faces.el
--- a/lisp/faces.el	Sat Jul 31 20:13:03 2010 +0300
+++ b/lisp/faces.el	Sat Jul 31 19:21:16 2010 +0200
@@ -376,7 +376,7 @@
 (defun face-all-attributes (face &optional frame)
   "Return an alist stating the attributes of FACE.
 Each element of the result has the form (ATTR-NAME . ATTR-VALUE).
-Normally the value describes the default attributes,
+If FRAME is omitted or nil the value describes the default attributes,
 but if you specify FRAME, the value describes the attributes
 of FACE on FRAME."
   (mapcar (lambda (pair)