[Emacs-diffs] Changes to emacs/lisp/faces.el

[Richard M. Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.247 emacs/lisp/faces.el:1.248
*** emacs/lisp/faces.el:1.247   Mon Dec 24 11:39:31 2001
--- emacs/lisp/faces.el Sun Dec 30 14:39:15 2001
***************
*** 1595,1606 ****
    "Set frame-local faces of FRAME from face specs and resources.
  Initialize colors of certain faces from frame parameters."
    (dolist (face (face-list))
!     (face-spec-set face (face-user-default-spec face) frame)
!     (internal-merge-in-global-face face frame)
!     (when (and (memq window-system '(x w32 mac))
!              (or (not (boundp 'inhibit-default-face-x-resources))
!                  (not (eq face 'default))))
!       (make-face-x-resource-internal face frame)))
  
    ;; Initialize attributes from frame parameters.
    (let ((params '((foreground-color default :foreground)
--- 1595,1607 ----
    "Set frame-local faces of FRAME from face specs and resources.
  Initialize colors of certain faces from frame parameters."
    (dolist (face (face-list))
!     (when (not (equal face 'default))
!       (face-spec-set face (face-user-default-spec face) frame)
!       (internal-merge-in-global-face face frame)
!       (when (and (memq window-system '(x w32 mac))
!                (or (not (boundp 'inhibit-default-face-x-resources))
!                    (not (eq face 'default))))
!       (make-face-x-resource-internal face frame))))
  
    ;; Initialize attributes from frame parameters.
    (let ((params '((foreground-color default :foreground)
***************
*** 1767,1773 ****
    :group 'basic-faces)
  
  
! (defface minibuffer-prompt '((t ()))
    "Face for minibuffer prompts."
    :version "21.3"
    :group 'basic-faces)
--- 1768,1775 ----
    :group 'basic-faces)
  
  
! (defface minibuffer-prompt '((((background dark)) (:foreground "cyan"))
!                            (t (:foreground "dark blue")))
    "Face for minibuffer prompts."
    :version "21.3"
    :group 'basic-faces)