(byte-compile-file): Don't write output if error.

[gnu-emacs] / lisp / faces.el

diff --git a/lisp/faces.el b/lisp/faces.el
index 405c6b4fe512e092483a4a9cdc9d7c953ff1e633..404086853556708335a457270b547d2fde2df77a 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -601,7 +601,7 @@ If NOERROR is non-nil, return nil on failure."
 
 (defun face-initialize ()
   (make-face 'default)
-;;;  (make-face 'modeline)
+  (make-face 'modeline)
   (make-face 'highlight)
   ;;
   ;; These aren't really special in any way, but they're nice to have around.
@@ -610,10 +610,10 @@ If NOERROR is non-nil, return nil on failure."
   (make-face 'bold)
   (make-face 'italic)
   (make-face 'bold-italic)
-  (make-face 'primary-selection)
+  (make-face 'region)
   (make-face 'secondary-selection)
 
-  (setq region-face (face-id 'primary-selection))
+  (setq region-face (face-id 'region))
 
   ;; Set up the faces of all existing X Window frames.
   (let ((frames (frame-list)))
@@ -682,10 +682,13 @@ If NOERROR is non-nil, return nil on failure."
 ;;;        (set-face-background-pixmap 'highlight "gray1" frame)
        (error (invert-face 'highlight frame))))
 
-  (or (face-differs-from-default-p 'primary-selection frame)
+  (or (face-differs-from-default-p 'region frame)
       (condition-case ()
-         (set-face-background 'primary-selection "gray" frame)
-       (error (invert-face 'primary-selection frame))))
+         (set-face-background 'region "gray" frame)
+       (error (invert-face 'region frame))))
+
+  (or (face-differs-from-default-p 'modeline frame)
+      (invert-face 'modeline frame))
 
   (or (face-differs-from-default-p 'secondary-selection frame)
       (condition-case ()
@@ -718,8 +721,7 @@ If NOERROR is non-nil, return nil on failure."
       (x-create-frame parameters)
     (let* ((frame (x-create-frame parameters))
           (faces (copy-alist global-face-data))
-          (rest faces)
-          default modeline)
+          (rest faces))
       (set-frame-face-alist frame faces)
 
       ;; Copy the vectors that represent the faces.
@@ -729,20 +731,8 @@ If NOERROR is non-nil, return nil on failure."
        (make-face-x-resource-internal (cdr (car rest)) frame t)
        (setq rest (cdr rest)))
 
-      (setq default (internal-get-face 'default frame)
-           modeline (internal-get-face 'modeline frame))
-
       (x-initialize-frame-faces frame)
 
-  ;;;    ;; Make sure the modeline face is fully qualified.
-  ;;;    (if (and (not (face-font modeline frame)) (face-font default frame))
-  ;;;  (set-face-font modeline (face-font default frame) frame))
-  ;;;    (if (and (not (face-background modeline frame))
-  ;;;       (face-background default frame))
-  ;;;  (set-face-background modeline (face-background default frame) frame))
-  ;;;    (if (and (not (face-foreground modeline frame))
-  ;;;       (face-foreground default frame))
-  ;;;  (set-face-foreground modeline (face-foreground default frame) frame))
       frame)))
 
 ;; If we are already using x-window frames, initialize faces for them.