Mercurial > emacs

changeset 17160:5bf55bb553f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Simon Marshall <simon@gnu.org>
date Sat, 15 Mar 1997 13:14:24 +0000
parents 6f1e715cbd58
children a2d3b455c6f4
files lisp/faces.el
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)))