procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/faces.el (face-name): Return input arg `face' as is

Browse source 
when it's not a symbol.
(x-resolve-font-name): Don't check if the face is a symbol.

Fixes: debbugs:17956
This commit is contained in:
Juri Linkov 2014-07-08 12:03:23 +03:00
parent b08e34f03a
commit 6dc311adc3
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2014-07-08 Juri Linkov <juri@jurta.org>
* faces.el (face-name): Return input arg `face' as is
when it's not a symbol.
(x-resolve-font-name): Don't check if the face is a symbol.
(Bug#17956)
2014-07-08 Juri Linkov <juri@jurta.org>
* facemenu.el (list-colors-print): In help-echo format use %.2f

9
lisp/faces.el
View file

@ -359,7 +359,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)
@ -2731,8 +2734,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