(input-method-exit-on-first-char):

[gnu-emacs] / lisp / cus-face.el

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 3662f296baa973fdcf366da8b61b60b30cf63384..b94ebbd033bdfbe15eec575c6b6899ba9d07f549 100644 (file)
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -53,9 +53,12 @@
          (while frames
            (setq frame (car frames)
                  frames (cdr frames))
-           (face-spec-set face value frame)))))
-    (when (and doc (null (face-doc-string face)))
-      (set-face-doc-string face doc))
+           (face-spec-set face value frame)))
+       ;; When making a face after frames already exist
+       (if (memq window-system '(x w32))
+           (make-face-x-resource-internal face))))
+    (when (and doc (null (face-documentation face)))
+      (set-face-documentation face doc))
     (custom-handle-all-keywords face args 'custom-face)
     (run-hooks 'custom-define-hook))
   face)
@@ -83,12 +86,12 @@ Control whether the text should be in inverse video.")
                set-face-inverse-video-p
                face-inverse-video-p)
     (:foreground (color :tag "Foreground"
-                       :value "black"
+                       :value ""
                        :help-echo "Set foreground color.")
                 set-face-foreground
                 face-foreground)
     (:background (color :tag "Background"
-                       :value "white"
+                       :value ""
                        :help-echo "Set background color.")
                 set-face-background
                 face-background)
@@ -99,7 +102,7 @@ Control whether the text should be in inverse video.")
   "Alist of face attributes. 
 The elements are of the form (KEY TYPE SET GET),
 where KEY is the name of the attribute,
-TYPE is a widget type for editing the attibute,
+TYPE is a widget type for editing the attribute,
 SET is a function for setting the attribute value,
 and GET is a function for getiing the attribute value.