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

[Juri Linkov]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.282 emacs/lisp/font-lock.el:1.283
*** emacs/lisp/font-lock.el:1.282       Sat Nov  5 07:29:45 2005
--- emacs/lisp/font-lock.el     Thu Nov 17 07:16:45 2005
***************
*** 216,222 ****
    :link '(custom-manual "(elisp)Font Lock Mode")
    :group 'faces)
  
! (defgroup font-lock-highlighting-faces nil
    "Faces for highlighting text."
    :prefix "font-lock-"
    :group 'font-lock)
--- 216,222 ----
    :link '(custom-manual "(elisp)Font Lock Mode")
    :group 'faces)
  
! (defgroup font-lock-faces nil
    "Faces for highlighting text."
    :prefix "font-lock-"
    :group 'font-lock)
***************
*** 1667,1673 ****
       )
      (t (:weight bold :slant italic)))
    "Font Lock mode face used to highlight comments."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-comment-delimiter-face
    '((default :inherit font-lock-comment-face)
--- 1667,1673 ----
       )
      (t (:weight bold :slant italic)))
    "Font Lock mode face used to highlight comments."
!   :group 'font-lock-faces)
  
  (defface font-lock-comment-delimiter-face
    '((default :inherit font-lock-comment-face)
***************
*** 1678,1684 ****
      (((class color) (min-colors 8) (background dark))
       :foreground "red1"))
    "Font Lock mode face used to highlight comment delimiters."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-string-face
    '((((class grayscale) (background light)) (:foreground "DimGray" :slant 
italic))
--- 1678,1684 ----
      (((class color) (min-colors 8) (background dark))
       :foreground "red1"))
    "Font Lock mode face used to highlight comment delimiters."
!   :group 'font-lock-faces)
  
  (defface font-lock-string-face
    '((((class grayscale) (background light)) (:foreground "DimGray" :slant 
italic))
***************
*** 1690,1701 ****
      (((class color) (min-colors 8)) (:foreground "green"))
      (t (:slant italic)))
    "Font Lock mode face used to highlight strings."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-doc-face
    '((t :inherit font-lock-string-face))
    "Font Lock mode face used to highlight documentation."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-keyword-face
    '((((class grayscale) (background light)) (:foreground "LightGray" :weight 
bold))
--- 1690,1701 ----
      (((class color) (min-colors 8)) (:foreground "green"))
      (t (:slant italic)))
    "Font Lock mode face used to highlight strings."
!   :group 'font-lock-faces)
  
  (defface font-lock-doc-face
    '((t :inherit font-lock-string-face))
    "Font Lock mode face used to highlight documentation."
!   :group 'font-lock-faces)
  
  (defface font-lock-keyword-face
    '((((class grayscale) (background light)) (:foreground "LightGray" :weight 
bold))
***************
*** 1707,1713 ****
      (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
      (t (:weight bold)))
    "Font Lock mode face used to highlight keywords."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-builtin-face
    '((((class grayscale) (background light)) (:foreground "LightGray" :weight 
bold))
--- 1707,1713 ----
      (((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
      (t (:weight bold)))
    "Font Lock mode face used to highlight keywords."
!   :group 'font-lock-faces)
  
  (defface font-lock-builtin-face
    '((((class grayscale) (background light)) (:foreground "LightGray" :weight 
bold))
***************
*** 1719,1725 ****
      (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
      (t (:weight bold)))
    "Font Lock mode face used to highlight builtins."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-function-name-face
    '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
--- 1719,1725 ----
      (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
      (t (:weight bold)))
    "Font Lock mode face used to highlight builtins."
!   :group 'font-lock-faces)
  
  (defface font-lock-function-name-face
    '((((class color) (min-colors 88) (background light)) (:foreground "Blue1"))
***************
*** 1729,1735 ****
      (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
      (t (:inverse-video t :weight bold)))
    "Font Lock mode face used to highlight function names."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-variable-name-face
    '((((class grayscale) (background light))
--- 1729,1735 ----
      (((class color) (min-colors 8)) (:foreground "blue" :weight bold))
      (t (:inverse-video t :weight bold)))
    "Font Lock mode face used to highlight function names."
!   :group 'font-lock-faces)
  
  (defface font-lock-variable-name-face
    '((((class grayscale) (background light))
***************
*** 1743,1749 ****
      (((class color) (min-colors 8)) (:foreground "yellow" :weight light))
      (t (:weight bold :slant italic)))
    "Font Lock mode face used to highlight variable names."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-type-face
    '((((class grayscale) (background light)) (:foreground "Gray90" :weight 
bold))
--- 1743,1749 ----
      (((class color) (min-colors 8)) (:foreground "yellow" :weight light))
      (t (:weight bold :slant italic)))
    "Font Lock mode face used to highlight variable names."
!   :group 'font-lock-faces)
  
  (defface font-lock-type-face
    '((((class grayscale) (background light)) (:foreground "Gray90" :weight 
bold))
***************
*** 1755,1761 ****
      (((class color) (min-colors 8)) (:foreground "green"))
      (t (:weight bold :underline t)))
    "Font Lock mode face used to highlight type and classes."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-constant-face
    '((((class grayscale) (background light))
--- 1755,1761 ----
      (((class color) (min-colors 8)) (:foreground "green"))
      (t (:weight bold :underline t)))
    "Font Lock mode face used to highlight type and classes."
!   :group 'font-lock-faces)
  
  (defface font-lock-constant-face
    '((((class grayscale) (background light))
***************
*** 1769,1775 ****
      (((class color) (min-colors 8)) (:foreground "magenta"))
      (t (:weight bold :underline t)))
    "Font Lock mode face used to highlight constants and labels."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-warning-face
    '((((class color) (min-colors 88) (background light)) (:foreground "Red1" 
:weight bold))
--- 1769,1775 ----
      (((class color) (min-colors 8)) (:foreground "magenta"))
      (t (:weight bold :underline t)))
    "Font Lock mode face used to highlight constants and labels."
!   :group 'font-lock-faces)
  
  (defface font-lock-warning-face
    '((((class color) (min-colors 88) (background light)) (:foreground "Red1" 
:weight bold))
***************
*** 1779,1805 ****
      (((class color) (min-colors 8)) (:foreground "red"))
      (t (:inverse-video t :weight bold)))
    "Font Lock mode face used to highlight warnings."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-negation-char-face
    '((t nil))
    "Font Lock mode face used to highlight easy to overlook negation."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-preprocessor-face
    '((t :inherit font-lock-builtin-face))
    "Font Lock mode face used to highlight preprocessor directives."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-regexp-grouping-backslash
    '((t :inherit bold))
    "Font Lock mode face for backslashes in Lisp regexp grouping constructs."
!   :group 'font-lock-highlighting-faces)
  
  (defface font-lock-regexp-grouping-construct
    '((t :inherit bold))
    "Font Lock mode face used to highlight grouping constructs in Lisp regexps."
!   :group 'font-lock-highlighting-faces)
  
  ;;; End of Colour etc. support.
  
--- 1779,1805 ----
      (((class color) (min-colors 8)) (:foreground "red"))
      (t (:inverse-video t :weight bold)))
    "Font Lock mode face used to highlight warnings."
!   :group 'font-lock-faces)
  
  (defface font-lock-negation-char-face
    '((t nil))
    "Font Lock mode face used to highlight easy to overlook negation."
!   :group 'font-lock-faces)
  
  (defface font-lock-preprocessor-face
    '((t :inherit font-lock-builtin-face))
    "Font Lock mode face used to highlight preprocessor directives."
!   :group 'font-lock-faces)
  
  (defface font-lock-regexp-grouping-backslash
    '((t :inherit bold))
    "Font Lock mode face for backslashes in Lisp regexp grouping constructs."
!   :group 'font-lock-faces)
  
  (defface font-lock-regexp-grouping-construct
    '((t :inherit bold))
    "Font Lock mode face used to highlight grouping constructs in Lisp regexps."
!   :group 'font-lock-faces)
  
  ;;; End of Colour etc. support.