summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0031d1be26d..009eb0712c1 100644
--- 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 83c7c8b2a0f..b7c238e14f3 100644
--- 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)