2 files changed, 11 insertions, 0 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index d1148eef101..a9ca8b7858c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2008-10-21  Eli Zaretskii  <eliz@gnu.org>
 
+        * display.texi (Attribute Functions): Document `face-all-attributes'.
+
         * frames.texi (Color Names): Add an xref to `read-color'.
 
         * minibuf.texi (High-Level Completion): Document `read-color'.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a8e8e531e30..983f7443240 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2217,6 +2217,15 @@ For example:
 @end example
 @end defun
 
+@defun face-all-attributes face &optional frame
+This function returns an alist of attributes of @var{face}.  The
+elements of the result are name-value pairs of the form
+@w{@code{(@var{attr-name} . @var{attr-value})}}.  Optional argument
+@var{frame} specifies the frame whose definition of @var{face} to
+return; if omitted or @code{nil}, the returned value describes the
+default attributes of @var{face} for newly created frames.
+@end defun
+
 @defun merge-face-attribute attribute value1 value2
 If @var{value1} is a relative value for the face attribute
 @var{attribute}, returns it merged with the underlying value