Mercurial > emacs

changeset 87502:a6788888f377

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(face-all-attributes): If FRAME is nil, return defaults.
author Richard M. Stallman <rms@gnu.org>
date Mon, 31 Dec 2007 15:01:10 +0000
parents 38cad849184d
children 832b50bed6c7
files lisp/faces.el
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/faces.el	Mon Dec 31 10:22:52 2007 +0000
+++ b/lisp/faces.el	Mon Dec 31 15:01:10 2007 +0000
@@ -357,8 +357,9 @@
 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)