# HG changeset patch # User Richard M. Stallman <rms@gnu.org> # Date 737566910 0 # Node ID 9c22af6d78858e2b0a4d3676ea602e99b2b87b5e # Parent bddd28afcc26fc436653c7c647e2ef1ac2626820 (face-initialize): Do make the modeline face. (x-initialize-frame-faces): Explicitly invert `modeline' face. (x-create-frame-with-faces): Simplify; do nothing special with `default' or `modeline' face. diff -r bddd28afcc26 -r 9c22af6d7885 lisp/faces.el --- a/lisp/faces.el Sun May 16 15:41:14 1993 +0000 +++ b/lisp/faces.el Sun May 16 15:41:50 1993 +0000 @@ -601,7 +601,7 @@ (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. @@ -687,6 +687,9 @@ (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 () (condition-case () @@ -718,8 +721,7 @@ (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 @@ (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.