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

[Richard M . Stallman]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.294 emacs/lisp/faces.el:1.295
*** emacs/lisp/faces.el:1.294   Wed Dec  8 21:31:32 2004
--- emacs/lisp/faces.el Mon Dec 13 19:29:33 2004
***************
*** 1334,1354 ****
    (unless frame
      (setq frame (selected-frame)))
    (let ((tail spec)
!       result all)
      (while tail
        (let* ((entry (pop tail))
             (display (car entry))
!            (attrs (cdr entry)))
!       (when (face-spec-set-match-display display frame)
!         (setq result (if (null (cdr attrs)) ;; was (listp (car attrs))
!                          ;; Old-style entry, the attribute list is the
!                          ;; first element.
!                          (car attrs)
!                        attrs))
!         (if (eq display t)
!             (setq all result result nil)
            (setq tail nil)))))
!     (if all (append result all) result)))
  
  
  (defun face-spec-reset-face (face &optional frame)
--- 1334,1362 ----
    (unless frame
      (setq frame (selected-frame)))
    (let ((tail spec)
!       result defaults)
      (while tail
        (let* ((entry (pop tail))
             (display (car entry))
!            (attrs (cdr entry))
!            thisval)
!       ;; Get the attributes as actually specified by this alternative.
!       (setq thisval
!             (if (null (cdr attrs)) ;; was (listp (car attrs))
!                 ;; Old-style entry, the attribute list is the
!                 ;; first element.
!                 (car attrs)
!               attrs))
! 
!       ;; If the condition is `default', that sets the default
!       ;; for following conditions.
!       (if (eq display 'default)
!           (setq defaults thisval)
!         ;; Otherwise, if it matches, use it.
!         (when (face-spec-set-match-display display frame)
!           (setq result thisval)
            (setq tail nil)))))
!     (if defaults (append result defaults) result)))
  
  
  (defun face-spec-reset-face (face &optional frame)
***************
*** 1786,1792 ****
    :group 'basic-faces)
  
  (defface mode-line-inactive
!   '((t
       :inherit mode-line)
      (((type x w32 mac) (background light) (class color))
       :weight light
--- 1794,1800 ----
    :group 'basic-faces)
  
  (defface mode-line-inactive
!   '((default
       :inherit mode-line)
      (((type x w32 mac) (background light) (class color))
       :weight light
***************
*** 1806,1812 ****
  (put 'modeline-inactive 'face-alias 'mode-line-inactive)
  
  (defface header-line
!   '((t
       :inherit mode-line)
      (((type tty))
       ;; This used to be `:inverse-video t', but that doesn't look very
--- 1814,1820 ----
  (put 'modeline-inactive 'face-alias 'mode-line-inactive)
  
  (defface header-line
!   '((default
       :inherit mode-line)
      (((type tty))
       ;; This used to be `:inverse-video t', but that doesn't look very
***************
*** 1842,1848 ****
  
  
  (defface tool-bar
!   '((t
       :box (:line-width 1 :style released-button)
       :foreground "black")
      (((type x w32 mac) (class color))
--- 1850,1856 ----
  
  
  (defface tool-bar
!   '((default
       :box (:line-width 1 :style released-button)
       :foreground "black")
      (((type x w32 mac) (class color))