From fbd441167278e58082003562199e7dad9f6828d9 Mon Sep 17 00:00:00 2001 From: Simon Marshall Date: Sat, 15 Mar 1997 13:14:24 +0000 Subject: [PATCH] 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. --- lisp/faces.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 6d1e195b14..4460f2b550 100644 --- 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))) -- 2.39.2