comparison lisp/prim/faces.el @ 108:360340f9fd5f r20-1b6

Import from CVS: tag r20-1b6
author cvs
date Mon, 13 Aug 2007 09:18:39 +0200
parents 8ff55ebd4be9
children 7d55a9ba150c
comparison
equal deleted inserted replaced
107:523141596bda 108:360340f9fd5f
1066 See `face-property-instance' for the semantics of the DOMAIN argument." 1066 See `face-property-instance' for the semantics of the DOMAIN argument."
1067 (font-proportional-p (face-font face) domain charset)) 1067 (font-proportional-p (face-font face) domain charset))
1068 1068
1069 1069
1070 (defvar init-face-from-resources t 1070 (defvar init-face-from-resources t
1071 "If non-nil, attempt to initialize faces from the reseource database.") 1071 "If non-nil, attempt to initialize faces from the resource database.")
1072 1072
1073 (defun make-empty-face (name &optional doc-string temporary) 1073 (defun make-empty-face (name &optional doc-string temporary)
1074 "Like `make-face', but doesn't query the reseource database." 1074 "Like `make-face', but doesn't query the resource database."
1075 (let ((init-face-from-resources nil)) 1075 (let ((init-face-from-resources nil))
1076 (make-face name doc-string temporary))) 1076 (make-face name doc-string temporary)))
1077 1077
1078 (defun init-face-from-resources (face &optional locale) 1078 (defun init-face-from-resources (face &optional locale)
1079 "Initialize FACE from the resource database. 1079 "Initialize FACE from the resource database.
1232 ;; similar for bold-italic. 1232 ;; similar for bold-italic.
1233 (unless (face-differs-from-default-p 'bold-italic device) 1233 (unless (face-differs-from-default-p 'bold-italic device)
1234 (make-face-bold-italic 'bold-italic device) 1234 (make-face-bold-italic 'bold-italic device)
1235 ;; if we couldn't get a bold-italic version, try just bold. 1235 ;; if we couldn't get a bold-italic version, try just bold.
1236 (unless (face-differs-from-default-p 'bold-italic device) 1236 (unless (face-differs-from-default-p 'bold-italic device)
1237 (make-face-bold-italic 'bold-italic device) 1237 (make-face-bold 'bold-italic device)
1238 ;; if we couldn't get bold or bold-italic, then that's probably because 1238 ;; if we couldn't get bold or bold-italic, then that's probably because
1239 ;; the default font is bold, so make the `bold-italic' face be unbold. 1239 ;; the default font is bold, so make the `bold-italic' face be unbold.
1240 (unless (face-differs-from-default-p 'bold-italic device) 1240 (unless (face-differs-from-default-p 'bold-italic device)
1241 (make-face-unbold 'bold-italic device) 1241 (make-face-unbold 'bold-italic device)
1242 (make-face-italic 'bold-italic device) 1242 (make-face-italic 'bold-italic device)