[Emacs-diffs] emacs-24 r117367: * lisp/faces.el (face-name): Undo last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 117367
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17956
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-07-09 14:46:33 -0400
message:
  * lisp/faces.el (face-name): Undo last change.
  (x-resolve-font-name): Don't call face-name.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/faces.el                  faces.el-20091113204419-o5vbwnq5f7feedwu-562

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-09 03:55:53 +0000
+++ b/lisp/ChangeLog    2014-07-09 18:46:33 +0000
@@ -1,3 +1,8 @@
+2014-07-09  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        Fix dedenters and electric colon handling. (Bug#15163)

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2014-07-08 09:03:23 +0000
+++ b/lisp/faces.el     2014-07-09 18:46:33 +0000
@@ -359,10 +359,7 @@
 
 (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 @@
 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