(face-all-attributes): If FRAME is nil, return defaults.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a645e75e3c..cd73a8e0018 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-31  Richard Stallman  <rms@gnu.org>
+
+        * faces.el (face-all-attributes): If FRAME is nil, return defaults.
+
 2007-12-31  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/calc-units.el (calc-convert-temperature): Ensure that units
diff --git a/lisp/faces.el b/lisp/faces.el
index 5f8f6d58522..b2646b21a1a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -357,8 +357,9 @@ Each element of the result has the form (ATTR-NAME . ATTR-VALUE).
 Normally the value describes the default attributes,
 but if you specify FRAME, the value describes the attributes
 of FACE on FRAME."
-  (mapcar (lambda (pair) (let ((attr (car pair)))
-                           (cons attr (face-attribute face attr frame))))
+  (mapcar (lambda (pair)
+            (let ((attr (car pair)))
+              (cons attr (face-attribute face attr (or frame t)))))
           face-attribute-name-alist))
 
 (defun face-attribute (face attribute &optional frame inherit)