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

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

Fixes: debbugs:17956

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bf133af77abcdac92cd770b431e2632c934a54e..1ad086acf612c17d45143e05db1459fb627d57a8 100644 (file)
--- 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 d0e768c834ec771c7c60ad13204741f0a0974ae8..f316245d165f9264adbef83204b18341f5af4fc5 100644 (file)
--- 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