Commit f972be09 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/faces.el (face-name): Undo last change.

(x-resolve-font-name): Don't call face-name.

Fixes: debbugs:17956
parent fded0b4a
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)
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment