summaryrefslogtreecommitdiff
path: root/lisp/faces.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2005-06-21 15:59:12 +0000
committerJuri Linkov <juri@jurta.org>2005-06-21 15:59:12 +0000
commite44d251c0d57f0cb1c8850e0cb6fcab8e38316d5 (patch)
treef2c7cb1948b61557c885925cdd9e608ed69fae52 /lisp/faces.el
parentf0cdbdfa39012d5e3673cb8b47f06465d981224f (diff)
downloademacs-e44d251c0d57f0cb1c8850e0cb6fcab8e38316d5.tar.gz
(face-user-default-spec): Try getting `customized-face' prior to `saved-face'.
(frame-background-mode): Refill docstring.
Diffstat (limited to 'lisp/faces.el')
-rw-r--r--lisp/faces.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/faces.el b/lisp/faces.el
index 2942438a32a..8cca01ad432 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1477,7 +1477,8 @@ If there is no default for FACE, return nil."
(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 nor a default for FACE, return nil."
- (or (get face 'saved-face)
+ (or (get face 'customized-face)
+ (get face 'saved-face)
(face-default-spec face)))
@@ -1549,9 +1550,9 @@ If omitted or nil, that stands for the selected frame's display."
(defcustom frame-background-mode nil
"*The brightness of the background.
-Set this to the symbol `dark' if your background color is dark, `light' if
-your background is light, or nil (default) if you want Emacs to
-examine the brightness for you. Don't set this variable with `setq';
+Set this to the symbol `dark' if your background color is dark,
+`light' if your background is light, or nil (default) if you want Emacs
+to examine the brightness for you. Don't set this variable with `setq';
this won't have the expected effect."
:group 'faces
:set #'(lambda (var value)