diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-07-12 10:53:29 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-07-12 10:53:29 -0700 |
| commit | b39c4d7b33952e0125fbefbcb3d9f528b6570f40 (patch) | |
| tree | 17fd0630dacfe29b0c2486b9f5c923293e872a70 /lisp/faces.el | |
| parent | 2a0bae50e3611a6bd2d584f7a85677b74f1aa71b (diff) | |
| parent | fb02552638b0c653bfc3d269d879fdffba37bd31 (diff) | |
| download | emacs-b39c4d7b33952e0125fbefbcb3d9f528b6570f40.tar.gz | |
Merge from emacs-24; up to 2014-06-22T05:00:14Z!dmantipov@yandex.ru
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index bb77af0425e..d9239d9e1eb 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -370,10 +370,7 @@ If `inhibit-x-resources' is non-nil, this function does nothing." (defun face-name (face) "Return the name of face FACE." - (check-face face) - (if (symbolp face) - (symbol-name face) - face)) + (symbol-name (check-face face))) (defun face-all-attributes (face &optional frame) @@ -2749,8 +2746,6 @@ 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." - (when face - (setq face (face-name face))) (and (eq frame t) (setq frame nil)) (if pattern |