aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorMiles Bader2000-10-24 01:17:23 +0000
committerMiles Bader2000-10-24 01:17:23 +0000
commit94fe8a31c79c92bdb518bbbbbdc982a24d875bd2 (patch)
tree015c7d7369c66ec7d22b8493e7bfc20cf790aa9e /lisp/faces.el
parent7ae339a717ad297cdea2db91ca669077895f3449 (diff)
downloademacs-94fe8a31c79c92bdb518bbbbbdc982a24d875bd2.tar.gz
emacs-94fe8a31c79c92bdb518bbbbbdc982a24d875bd2.zip
(face-default-spec, face-user-default-spec): Make defsubsts.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el16
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."
398 (memq italic '(italic oblique)))) 398 (memq italic '(italic oblique))))
399 399
400 400
401
402
403 401
404;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 402;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
405;;; Face documentation. 403;;; Face documentation.
@@ -1221,17 +1219,17 @@ is used. If nil or omitted, use the selected 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)
1225 "Return the user's customized face-spec for FACE, or the default if none.
1226If there is neither a user setting or a default for FACE, return nil."
1227 (or (get face 'saved-face)
1228 (get face 'face-defface-spec)))
1229
1230(defun face-default-spec (face)
1231 "Return the default face-spec for FACE, ignoring any user customization. 1223 "Return the default face-spec for FACE, ignoring any user customization.
1232If there is no default for FACE, return nil." 1224If there is no default for FACE, return nil."
1233 (get face 'face-defface-spec)) 1225 (get face 'face-defface-spec))
1234 1226
1227(defsubst face-user-default-spec (face)
1228 "Return the user's customized face-spec for FACE, or the default if none.
1229If there is neither a user setting or a default for FACE, return nil."
1230 (or (get face 'saved-face)
1231 (face-default-spec face)))
1232
1235 1233
1236;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1234;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1237;;; Frame-type independent color support. 1235;;; Frame-type independent color support.