diff options
| author | Miles Bader <miles@gnu.org> | 2000-10-24 01:16:41 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2000-10-24 01:16:41 +0000 |
| commit | aa1a502f429e46bd7b0f0c136a1c1fa3f5148077 (patch) | |
| tree | cfd637102d3be454769d8416a79757f0d5b1e9db /lisp/faces.el | |
| parent | de7a87fbaaf93c4d243a439d8fb6a9732b5068e7 (diff) | |
| download | emacs-aa1a502f429e46bd7b0f0c136a1c1fa3f5148077.tar.gz | |
(face-default-spec, face-user-default-spec): Make defsubsts.
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index ba0bfc70321..e886633d324 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -398,8 +398,6 @@ Use `face-attribute' for finer control." (memq italic '(italic oblique)))) - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Face documentation. @@ -1221,17 +1219,17 @@ is used. If nil or omitted, use the selected frame." "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) - "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) +(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) + (face-default-spec face))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Frame-type independent color support. |