diff options
| author | Richard M. Stallman <[email protected]> | 2007-12-31 15:02:34 +0000 |
|---|---|---|
| committer | Richard M. Stallman <[email protected]> | 2007-12-31 15:02:34 +0000 |
| commit | 606c9f599e3ff5fc66935ab6380e36b777d1060d (patch) | |
| tree | 38380fdf5c6fe507d7722445e4886a90d3f0210e | |
| parent | 15f16c1ba7dd122c0a2c22fb57e93aed3a97d28f (diff) | |
(face-all-attributes): If FRAME is nil, return defaults.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/faces.el | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a645e75e3..cd73a8e001 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-12-31 Richard Stallman <[email protected]> + + * faces.el (face-all-attributes): If FRAME is nil, return defaults. + 2007-12-31 Jay Belanger <[email protected]> * calc/calc-units.el (calc-convert-temperature): Ensure that units diff --git a/lisp/faces.el b/lisp/faces.el index 5f8f6d5852..b2646b21a1 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) |