Mercurial > emacs
changeset 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 | 0fbf137d9f40 |
| children | 3c1f148d9640 |
| files | lisp/faces.el |
| diffstat | 1 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/faces.el Tue Oct 24 00:09:09 2000 +0000 +++ b/lisp/faces.el Tue Oct 24 01:16:41 2000 +0000 @@ -398,8 +398,6 @@ (memq italic '(italic oblique)))) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Face documentation. @@ -1221,16 +1219,16 @@ "Return t if FACE, on FRAME, matches what SPEC says it should look like." (face-attr-match-p face (face-spec-choose spec frame) frame)) -(defun face-user-default-spec (face) +(defsubst face-default-spec (face) + "Return the default face-spec for FACE, ignoring any user customization. +If there is no default for FACE, return nil." + (get face 'face-defface-spec)) + +(defsubst face-user-default-spec (face) "Return the user's customized face-spec for FACE, or the default if none. If there is neither a user setting or a default for FACE, return nil." (or (get face 'saved-face) - (get face 'face-defface-spec))) - -(defun face-default-spec (face) - "Return the default face-spec for FACE, ignoring any user customization. -If there is no default for FACE, return nil." - (get face 'face-defface-spec)) + (face-default-spec face))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;