From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 21 Nov 1993 07:23:17 +0000 (+0000)
Subject: (x-resolve-font-name): Undo previous change.
X-Git-Tag: emacs-19.34~10759
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8db93e456a54b713b7f8a199382f72d27a0ff506;p=emacs.git

(x-resolve-font-name): Undo previous change.
---

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