Commit fbd44116 authored by Simon Marshall's avatar Simon Marshall

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

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.
parent 4a11114d
......@@ -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)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment