From 4901eb1b09e42354e243fa6572068f63f3d65b52 Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Sat, 20 Nov 1993 08:42:47 +0000
Subject: [PATCH] (x-resolve-font-name): Don't pass FACE to x-list-fonts if
 FACE has nil as its font.

---
 lisp/faces.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/faces.el b/lisp/faces.el
index 32a0c995ab0..5abcd0927c2 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -439,7 +439,9 @@ also the same size as FACE on FRAME."
   (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'"
-- 
2.39.5