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

[Miles Bader]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.285 emacs/lisp/faces.el:1.286
*** emacs/lisp/faces.el:1.285   Wed Jun  2 00:35:23 2004
--- emacs/lisp/faces.el Fri Jun  4 02:50:11 2004
***************
*** 1510,1520 ****
         (if (framep display)
             display
           (car (frames-on-display-list display)))))
!     ;; For now, we assume that non-tty displays can support everything.
!     ;; Later, we should add the ability to query about specific fonts,
!     ;; colors, etc.
!     (or (memq (framep frame) '(x w32 mac))
!       (tty-supports-face-attributes-p attributes frame))))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 1510,1534 ----
         (if (framep display)
             display
           (car (frames-on-display-list display)))))
!     (if (not (memq (framep frame) '(x w32 mac)))
!       ;; On ttys, `tty-supports-face-attributes-p' does all the work we need.
!       (tty-supports-face-attributes-p attributes frame)
!       ;; For now, we assume that non-tty displays can support everything,
!       ;; and so we just check to see if any of the specified attributes is
!       ;; different from the default -- though this probably isn't always
!       ;; accurate for font-related attributes.  Later, we should add the
!       ;; ability to query about specific fonts, colors, etc.
!       (while (and attributes
!                 (let* ((attr (car attributes))
!                        (val (cadr attributes))
!                        (default-val (face-attribute 'default attr frame)))
!                   (if (and (stringp val) (stringp default-val))
!                       ;; compare string attributes case-insensitively
!                       (eq (compare-strings val nil nil default-val nil nil t)
!                           t)
!                     (equal val default-val))))
!       (setq attributes (cddr attributes)))
!       (not (null attributes)))))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;