Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Fixes: debbugs:17956
This commit is contained in:
Stefan Monnier 2014-07-09 14:46:33 -04:00
parent fded0b4a15
commit f972be090b
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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)

7
lisp/faces.el
View file

@ -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