(face-default-spec, face-user-default-spec): Make defsubsts.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90279721c8ba3828a4d6a79e81ebba47a59c17c2..a85a12b05e47fc98c8b62495474d6354e31d50ef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-24  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * faces.el (face-default-spec, face-user-default-spec): Make
+       defsubsts.
+
 2000-10-24  Andrew Choi  <akochoi@i-cable.com>
 
        * international/mule-conf.el (mac-roman-lower, mac-roman-upper):

diff --git a/lisp/faces.el b/lisp/faces.el
index ba0bfc703218efbba82bf83df512d563fe07b056..e886633d3248f5137321dcf5a037ec7b1b4bdaf5 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -398,8 +398,6 @@ Use `face-attribute' for finer control."
     (memq italic '(italic oblique))))
     
 
-
-
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; 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)))
+
 \f
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Frame-type independent color support.