diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-07-08 19:04:12 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-07-08 19:04:12 -0700 |
| commit | 5613a6f6d52bca0018c5777aba67a99f51016a35 (patch) | |
| tree | c070100c79442ae2f9876f82af4eeebadc39249c /lisp/faces.el | |
| parent | 27e81f9f4e368176a3b17ceeadd2e0aa5dd9d1ed (diff) | |
| parent | d8899d09b992d733dc1cc6ec93b11cb75ce84f5d (diff) | |
| download | emacs-5613a6f6d52bca0018c5777aba67a99f51016a35.tar.gz | |
Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index d8b3c7a6b0f..bb77af0425e 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -370,7 +370,10 @@ If `inhibit-x-resources' is non-nil, this function does nothing." (defun face-name (face) "Return the name of face FACE." - (symbol-name (check-face face))) + (check-face face) + (if (symbolp face) + (symbol-name face) + face)) (defun face-all-attributes (face &optional frame) @@ -2746,8 +2749,8 @@ If PATTERN is nil, return the name of the frame's base font, which never contains wildcards. Given optional arguments FACE and FRAME, return a font which is also the same size as FACE on FRAME, or fail." - (or (symbolp face) - (setq face (face-name face))) + (when face + (setq face (face-name face))) (and (eq frame t) (setq frame nil)) (if pattern |