diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-07-09 14:46:33 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-07-09 14:46:33 -0400 |
| commit | f972be090b0ffdfe7f6fe8a9616fb5f9d410522d (patch) | |
| tree | 2547fb11022e1c447bf6cbe5393cb6ba5c6eb9b0 /lisp | |
| parent | fded0b4a15d4ec7f92a64f03e9aa78f19a9b6031 (diff) | |
| download | emacs-f972be090b0ffdfe7f6fe8a9616fb5f9d410522d.tar.gz | |
* lisp/faces.el (face-name): Undo last change.
(x-resolve-font-name): Don't call face-name.
Fixes: debbugs:17956
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/faces.el | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5bf133af77a..1ad086acf61 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * faces.el (face-name): Undo last change. + (x-resolve-font-name): Don't call face-name (bug#17956). + 2014-07-09 Fabián Ezequiel Gallina <fgallina@gnu.org> Fix dedenters and electric colon handling. (Bug#15163) diff --git a/lisp/faces.el b/lisp/faces.el index d0e768c834e..f316245d165 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -359,10 +359,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) @@ -2734,8 +2731,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 |