Merged from miles@gnu.org--gnu-2005 (patch 438-440)

[gnu-emacs] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index 279eda8c7b32c3857987da0369e7978b6e49b0fb..20dbee745176eedcb54030553ab5a0b275826a4f 100644 (file)
--- 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)))
 
 \f
@@ -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)
@@ -1900,7 +1901,7 @@ created."
   :group 'modeline
   :group 'basic-faces)
 
-(defface vertical-divider
+(defface vertical-border
   '((default :inherit mode-line-inactive))
   "Face used for vertical window dividers on ttys."
   :version "22.1"
@@ -2136,7 +2137,7 @@ Note: Other faces cannot inherit from the cursor face."
   :group 'basic-faces)
 
 (defface escape-glyph
-  '((((background dark)) :foreground "pink2")
+  '((((background dark)) :foreground "cyan")
     ;; See the comment in minibuffer-prompt for
     ;; the reason not to use blue on MS-DOS.
     (((type pc)) :foreground "magenta")