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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a645e75e3c120852f4c9fa6641a34ac56a45574..cd73a8e00186f39af7281294a99c70baebb5d44b 100644 (file)
--- 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 5f8f6d58522a54a050948f21691f4ece4041b799..b2646b21a1a6188a8e02e5e599d736e331527d3e 100644 (file)
--- 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)