[Emacs-diffs] /srv/bzr/emacs/trunk r100950: * faces.el (face-all-attributes): Improved documentation (Bug#6767).

[Jan D]

------------------------------------------------------------
revno: 100950
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Sat 2010-07-31 19:21:16 +0200
message:
  * faces.el (face-all-attributes): Improved documentation (Bug#6767).
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-07-31 15:46:58 +0000
+++ b/lisp/ChangeLog    2010-07-31 17:21:16 +0000
@@ -1,3 +1,7 @@
+2010-07-31  Jan Djärv  <address@hidden>
+
+       * faces.el (face-all-attributes): Improved documentation (Bug#6767).
+
 2010-07-31  Eli Zaretskii  <address@hidden>
 
        * files.el (bidi-paragraph-direction): Define safe local values.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2010-07-02 22:28:52 +0000
+++ b/lisp/faces.el     2010-07-31 17:21:16 +0000
@@ -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)