# HG changeset patch
# User Simon Marshall <simon@gnu.org>
# Date 858431664 0
# Node ID 5bf55bb553f20a0b2edb425bbb204dd3a6d1a1d7
# Parent  6f1e715cbd58d2353643c0f0aebf73edcdd51ecc
When testing FACE's non-nil face-font with the default face font, use the frame's font parameter if the default face's face-font is nil.

diff -r 6f1e715cbd58 -r 5bf55bb553f2 lisp/faces.el
--- a/lisp/faces.el	Sat Mar 15 13:10:07 1997 +0000
+++ b/lisp/faces.el	Sat Mar 15 13:14:24 1997 +0000
@@ -564,8 +564,11 @@
 	      (or (equal (face-background default frame)
 			 (face-background face frame))
 		  (null (face-background face frame)))
-	      (or (equal (face-font default frame) (face-font face frame))
-		  (null (face-font face frame)))
+	      (or (null (face-font face frame))
+		  (equal (face-font face frame)
+			 (or (face-font default frame)
+			     (downcase
+			      (cdr (assq 'font (frame-parameters frame)))))))
 	      (or (equal (face-stipple default frame)
 			 (face-stipple face frame))
 		  (null (face-stipple face frame)))