* faces.el (face-all-attributes): Improved documentation (Bug#6767).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0031d1be26d89e6e600196b06a2ff7dcd8cd9f89..009eb0712c1e7e18db7b90db65e6827748f573ab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/faces.el b/lisp/faces.el
index 83c7c8b2a0f690e33273e60358b4ec9630d5bb63..b7c238e14f3005f45c9e79137cd9b0188c5c2a2b 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -376,7 +376,7 @@ FRAME nil or not specified means do it for all frames."
 (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)