Mercurial > emacs
comparison lisp/faces.el @ 32795:975cc2648ee4
(face-default-spec, face-user-default-spec): Make defsubsts.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 24 Oct 2000 01:16:41 +0000 |
| parents | a0ca98ed466a |
| children | e58bc9a59da7 |
comparison
equal
deleted
inserted
replaced
| 32794:0fbf137d9f40 | 32795:975cc2648ee4 |
|---|---|
| 395 If FRAME is omitted or nil, use the selected frame. | 395 If FRAME is omitted or nil, use the selected frame. |
| 396 Use `face-attribute' for finer control." | 396 Use `face-attribute' for finer control." |
| 397 (let ((italic (face-attribute face :slant frame))) | 397 (let ((italic (face-attribute face :slant frame))) |
| 398 (memq italic '(italic oblique)))) | 398 (memq italic '(italic oblique)))) |
| 399 | 399 |
| 400 | |
| 401 | |
| 402 | 400 |
| 403 | 401 |
| 404 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 402 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 405 ;;; Face documentation. | 403 ;;; Face documentation. |
| 406 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 404 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 1219 | 1217 |
| 1220 (defun face-spec-match-p (face spec &optional frame) | 1218 (defun face-spec-match-p (face spec &optional frame) |
| 1221 "Return t if FACE, on FRAME, matches what SPEC says it should look like." | 1219 "Return t if FACE, on FRAME, matches what SPEC says it should look like." |
| 1222 (face-attr-match-p face (face-spec-choose spec frame) frame)) | 1220 (face-attr-match-p face (face-spec-choose spec frame) frame)) |
| 1223 | 1221 |
| 1224 (defun face-user-default-spec (face) | 1222 (defsubst face-default-spec (face) |
| 1223 "Return the default face-spec for FACE, ignoring any user customization. | |
| 1224 If there is no default for FACE, return nil." | |
| 1225 (get face 'face-defface-spec)) | |
| 1226 | |
| 1227 (defsubst face-user-default-spec (face) | |
| 1225 "Return the user's customized face-spec for FACE, or the default if none. | 1228 "Return the user's customized face-spec for FACE, or the default if none. |
| 1226 If there is neither a user setting or a default for FACE, return nil." | 1229 If there is neither a user setting or a default for FACE, return nil." |
| 1227 (or (get face 'saved-face) | 1230 (or (get face 'saved-face) |
| 1228 (get face 'face-defface-spec))) | 1231 (face-default-spec face))) |
| 1229 | |
| 1230 (defun face-default-spec (face) | |
| 1231 "Return the default face-spec for FACE, ignoring any user customization. | |
| 1232 If there is no default for FACE, return nil." | |
| 1233 (get face 'face-defface-spec)) | |
| 1234 | 1232 |
| 1235 | 1233 |
| 1236 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 1234 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 1237 ;;; Frame-type independent color support. | 1235 ;;; Frame-type independent color support. |
| 1238 ;;; We keep the old x-* names as aliases for back-compatibility. | 1236 ;;; We keep the old x-* names as aliases for back-compatibility. |