# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 753866597 0
# Node ID 36508a7c0a3f2d8a88f7cd9012d8c1bf0a2395a1
# Parent  624596e9c5d1137e58fc9625bec7ae60bf716bcf
(x-resolve-font-name): Undo previous change.

diff -r 624596e9c5d1 -r 36508a7c0a3f lisp/faces.el
--- a/lisp/faces.el	Sun Nov 21 06:11:34 1993 +0000
+++ b/lisp/faces.el	Sun Nov 21 07:23:17 1993 +0000
@@ -439,9 +439,8 @@
   (and (eq frame t)
        (setq frame nil))
   (if pattern
-      (let ((fonts (x-list-fonts pattern
-				 (if (face-font face) face nil)
-				 frame)))
+      ;; Note that x-list-fonts has code to handle a face with nil as its font.
+      (let ((fonts (x-list-fonts pattern face frame)))
 	(or fonts
 	    (if face
 		(error "No fonts matching pattern are the same size as `%s'"