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

[Miles Bader]

Index: emacs/lisp/generic-x.el
diff -c emacs/lisp/generic-x.el:1.36 emacs/lisp/generic-x.el:1.37
*** emacs/lisp/generic-x.el:1.36        Tue May 17 15:55:16 2005
--- emacs/lisp/generic-x.el     Fri Jun 10 08:48:27 2005
***************
*** 1733,1749 ****
  
  (defconst show-tabs-generic-mode-font-lock-defaults-1
    '(;; trailing spaces must come before...
!     ("[ \t]+$" . 'show-tabs-space-face)
      ;; ...embedded tabs
!     ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab-face))))
  
  (defconst show-tabs-generic-mode-font-lock-defaults-2
    '(;; trailing spaces must come before...
!     ("[ \t]+$" . 'show-tabs-space-face)
      ;; ...tabs
!     ("\t+" . 'show-tabs-tab-face))))
  
! (defface show-tabs-tab-face
    '((((class grayscale) (background light)) (:background "DimGray"   :weight 
bold))
      (((class grayscale) (background dark))  (:background "LightGray" :weight 
bold))
      (((class color)     (min-colors 88))    (:background "red1"))
--- 1733,1749 ----
  
  (defconst show-tabs-generic-mode-font-lock-defaults-1
    '(;; trailing spaces must come before...
!     ("[ \t]+$" . 'show-tabs-space)
      ;; ...embedded tabs
!     ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab))))
  
  (defconst show-tabs-generic-mode-font-lock-defaults-2
    '(;; trailing spaces must come before...
!     ("[ \t]+$" . 'show-tabs-space)
      ;; ...tabs
!     ("\t+" . 'show-tabs-tab))))
  
! (defface show-tabs-tab
    '((((class grayscale) (background light)) (:background "DimGray"   :weight 
bold))
      (((class grayscale) (background dark))  (:background "LightGray" :weight 
bold))
      (((class color)     (min-colors 88))    (:background "red1"))
***************
*** 1751,1758 ****
      (t (:weight bold)))
    "Font Lock mode face used to highlight TABs."
    :group 'generic-x)
  
! (defface show-tabs-space-face
    '((((class grayscale) (background light)) (:background "DimGray"   :weight 
bold))
      (((class grayscale) (background dark))  (:background "LightGray" :weight 
bold))
      (((class color)     (min-colors 88))    (:background "yellow1"))
--- 1751,1760 ----
      (t (:weight bold)))
    "Font Lock mode face used to highlight TABs."
    :group 'generic-x)
+ ;; backward-compatibility alias
+ (put 'show-tabs-tab-face 'face-alias 'show-tabs-tab)
  
! (defface show-tabs-space
    '((((class grayscale) (background light)) (:background "DimGray"   :weight 
bold))
      (((class grayscale) (background dark))  (:background "LightGray" :weight 
bold))
      (((class color)     (min-colors 88))    (:background "yellow1"))
***************
*** 1760,1765 ****
--- 1762,1769 ----
      (t (:weight bold)))
    "Font Lock mode face used to highlight spaces."
    :group 'generic-x)
+ ;; backward-compatibility alias
+ (put 'show-tabs-space-face 'face-alias 'show-tabs-space)
  
  (define-generic-mode show-tabs-generic-mode
    nil ;; no comment char