# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 753784967 0
# Node ID 12a5a3e33209ac79b5f21eee4269279b2f87fc01
# Parent  09f37e86d7daf0f5bffdb5f9e7d16c75a22d0e6a
(x-resolve-font-name): Don't pass FACE to x-list-fonts
if FACE has nil as its font.

diff -r 09f37e86d7da -r 12a5a3e33209 lisp/faces.el
--- a/lisp/faces.el	Sat Nov 20 06:04:07 1993 +0000
+++ b/lisp/faces.el	Sat Nov 20 08:42:47 1993 +0000
@@ -439,7 +439,9 @@
   (and (eq frame t)
        (setq frame nil))
   (if pattern
-      (let ((fonts (x-list-fonts pattern face frame)))
+      (let ((fonts (x-list-fonts pattern
+				 (if (face-font face) face nil)
+				 frame)))
 	(or fonts
 	    (if face
 		(error "No fonts matching pattern are the same size as `%s'"