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

[Miles Bader]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.265 emacs/lisp/faces.el:1.266
*** emacs/lisp/faces.el:1.265   Sun Jun  9 08:57:35 2002
--- emacs/lisp/faces.el Sun Jun  9 22:15:05 2002
***************
*** 1318,1323 ****
--- 1318,1325 ----
                        ((eq req 'background)
                         (memq (frame-parameter frame 'background-mode)
                               options))
+                       ((eq req 'supports)
+                        (display-supports-face-attributes-p options frame))
                        (t (error "Unknown req `%S' with options `%S'"
                                  req options)))))
      match))
***************
*** 1494,1500 ****
  as it can display a yellowish color, but `:slant italic' will _not_ be
  satisified by the tty display code's automatic substitution of a `dim'
  face for italic."
!   (let ((frame (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.
--- 1496,1505 ----
  as it can display a yellowish color, but `:slant italic' will _not_ be
  satisified by the tty display code's automatic substitution of a `dim'
  face for italic."
!   (let ((frame
!        (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.
***************
*** 1938,1944 ****
    :group 'basic-faces)
  
  
! (defface italic '((t :slant italic))
    "Basic italic font."
    :group 'basic-faces)
  
--- 1943,1958 ----
    :group 'basic-faces)
  
  
! (defface italic
!   '((((supports :slant italic))
!      :slant italic)
!     (((supports :underline t))
!      :underline t)
!     (t
!      ;; default to italic, even it doesn't appear to be supported,
!      ;; because in some cases the display engine will do it's own
!      ;; workaround (to `dim' on ttys)
!      :slant italic))
    "Basic italic font."
    :group 'basic-faces)