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

[Richard M. Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.276 emacs/lisp/faces.el:1.277
*** emacs/lisp/faces.el:1.276   Wed Mar  5 05:36:51 2003
--- emacs/lisp/faces.el Mon May 19 10:46:06 2003
***************
*** 1657,1663 ****
        (progn
          (x-handle-reverse-video frame parameters)
          (frame-set-background-mode frame)
!         (face-set-after-frame-default frame)
          (if (or (null frame-list) (null visibility-spec))
              (make-frame-visible frame)
            (modify-frame-parameters frame (list visibility-spec)))
--- 1657,1664 ----
        (progn
          (x-handle-reverse-video frame parameters)
          (frame-set-background-mode frame)
!         ;; No need to call `face-set-after-frame-default'
!         ;; since x-create-frame does that.
          (if (or (null frame-list) (null visibility-spec))
              (make-frame-visible frame)
            (modify-frame-parameters frame (list visibility-spec)))
***************
*** 1670,1677 ****
  (defun face-set-after-frame-default (frame)
    "Set frame-local faces of FRAME from face specs and resources.
  Initialize colors of certain faces from frame parameters."
!   ;; Don't let frame creation fail because of an invalid face spec.
    (dolist (face (face-list))
      (condition-case ()
        (when (not (equal face 'default))
          (face-spec-set face (face-user-default-spec face) frame)
--- 1671,1691 ----
  (defun face-set-after-frame-default (frame)
    "Set frame-local faces of FRAME from face specs and resources.
  Initialize colors of certain faces from frame parameters."
!   (if (face-attribute 'default :font t)
!       (set-face-attribute 'default frame :font
!                         (face-attribute 'default :font t))
!     (set-face-attribute 'default frame :family
!                       (face-attribute 'default :family t))
!     (set-face-attribute 'default frame :height
!                       (face-attribute 'default :height t))
!     (set-face-attribute 'default frame :slant
!                       (face-attribute 'default :slant t))
!     (set-face-attribute 'default frame :weight
!                       (face-attribute 'default :weight t))
!     (set-face-attribute 'default frame :width
!                       (face-attribute 'default :width t)))
    (dolist (face (face-list))
+     ;; Don't let frame creation fail because of an invalid face spec.
      (condition-case ()
        (when (not (equal face 'default))
          (face-spec-set face (face-user-default-spec face) frame)