From 94fe8a31c79c92bdb518bbbbbdc982a24d875bd2 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Tue, 24 Oct 2000 01:17:23 +0000 Subject: [PATCH] (face-default-spec, face-user-default-spec): Make defsubsts. --- lisp/ChangeLog | 5 +++++ lisp/faces.el | 16 +++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 90279721c8b..a85a12b05e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-10-24 Miles Bader + + * faces.el (face-default-spec, face-user-default-spec): Make + defsubsts. + 2000-10-24 Andrew Choi * international/mule-conf.el (mac-roman-lower, mac-roman-upper): 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. -- 2.39.2