When testing FACE's non-nil face-font with the default face font, use the frame's...

diff --git a/lisp/faces.el b/lisp/faces.el
index 6d1e195b1401d2f8a1c9b2d8e8419fa726858516..4460f2b550453abb89ff877a8461cb83e8dc911a 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -564,8 +564,11 @@ If FRAME is nil or omitted, test the selected frame."
              (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)))