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

[Miles Bader]

Index: emacs/lisp/gnus/message.el
diff -c emacs/lisp/gnus/message.el:1.79 emacs/lisp/gnus/message.el:1.80
*** emacs/lisp/gnus/message.el:1.79     Tue Jun 14 11:23:09 2005
--- emacs/lisp/gnus/message.el  Thu Jun 16 03:48:18 2005
***************
*** 1124,1130 ****
      table)
    "Syntax table used while in Message mode.")
  
! (defface message-header-to-face
    '((((class color)
        (background dark))
       (:foreground "green2" :bold t))
--- 1124,1130 ----
      table)
    "Syntax table used while in Message mode.")
  
! (defface message-header-to
    '((((class color)
        (background dark))
       (:foreground "green2" :bold t))
***************
*** 1135,1142 ****
       (:bold t :italic t)))
    "Face used for displaying From headers."
    :group 'message-faces)
  
! (defface message-header-cc-face
    '((((class color)
        (background dark))
       (:foreground "green4" :bold t))
--- 1135,1144 ----
       (:bold t :italic t)))
    "Face used for displaying From headers."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-to-face 'face-alias 'message-header-to)
  
! (defface message-header-cc
    '((((class color)
        (background dark))
       (:foreground "green4" :bold t))
***************
*** 1147,1154 ****
       (:bold t)))
    "Face used for displaying Cc headers."
    :group 'message-faces)
  
! (defface message-header-subject-face
    '((((class color)
        (background dark))
       (:foreground "green3"))
--- 1149,1158 ----
       (:bold t)))
    "Face used for displaying Cc headers."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-cc-face 'face-alias 'message-header-cc)
  
! (defface message-header-subject
    '((((class color)
        (background dark))
       (:foreground "green3"))
***************
*** 1159,1166 ****
       (:bold t)))
    "Face used for displaying subject headers."
    :group 'message-faces)
  
! (defface message-header-newsgroups-face
    '((((class color)
        (background dark))
       (:foreground "yellow" :bold t :italic t))
--- 1163,1172 ----
       (:bold t)))
    "Face used for displaying subject headers."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-subject-face 'face-alias 'message-header-subject)
  
! (defface message-header-newsgroups
    '((((class color)
        (background dark))
       (:foreground "yellow" :bold t :italic t))
***************
*** 1171,1178 ****
       (:bold t :italic t)))
    "Face used for displaying newsgroups headers."
    :group 'message-faces)
  
! (defface message-header-other-face
    '((((class color)
        (background dark))
       (:foreground "#b00000"))
--- 1177,1186 ----
       (:bold t :italic t)))
    "Face used for displaying newsgroups headers."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-newsgroups-face 'face-alias 'message-header-newsgroups)
  
! (defface message-header-other
    '((((class color)
        (background dark))
       (:foreground "#b00000"))
***************
*** 1183,1190 ****
       (:bold t :italic t)))
    "Face used for displaying newsgroups headers."
    :group 'message-faces)
  
! (defface message-header-name-face
    '((((class color)
        (background dark))
       (:foreground "DarkGreen"))
--- 1191,1200 ----
       (:bold t :italic t)))
    "Face used for displaying newsgroups headers."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-other-face 'face-alias 'message-header-other)
  
! (defface message-header-name
    '((((class color)
        (background dark))
       (:foreground "DarkGreen"))
***************
*** 1195,1202 ****
       (:bold t)))
    "Face used for displaying header names."
    :group 'message-faces)
  
! (defface message-header-xheader-face
    '((((class color)
        (background dark))
       (:foreground "blue"))
--- 1205,1214 ----
       (:bold t)))
    "Face used for displaying header names."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-name-face 'face-alias 'message-header-name)
  
! (defface message-header-xheader
    '((((class color)
        (background dark))
       (:foreground "blue"))
***************
*** 1207,1214 ****
       (:bold t)))
    "Face used for displaying X-Header headers."
    :group 'message-faces)
  
! (defface message-separator-face
    '((((class color)
        (background dark))
       (:foreground "blue3"))
--- 1219,1228 ----
       (:bold t)))
    "Face used for displaying X-Header headers."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-header-xheader-face 'face-alias 'message-header-xheader)
  
! (defface message-separator
    '((((class color)
        (background dark))
       (:foreground "blue3"))
***************
*** 1219,1226 ****
       (:bold t)))
    "Face used for displaying the separator."
    :group 'message-faces)
  
! (defface message-cited-text-face
    '((((class color)
        (background dark))
       (:foreground "red"))
--- 1233,1242 ----
       (:bold t)))
    "Face used for displaying the separator."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-separator-face 'face-alias 'message-separator)
  
! (defface message-cited-text
    '((((class color)
        (background dark))
       (:foreground "red"))
***************
*** 1231,1238 ****
       (:bold t)))
    "Face used for displaying cited text names."
    :group 'message-faces)
  
! (defface message-mml-face
    '((((class color)
        (background dark))
       (:foreground "ForestGreen"))
--- 1247,1256 ----
       (:bold t)))
    "Face used for displaying cited text names."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-cited-text-face 'face-alias 'message-cited-text)
  
! (defface message-mml
    '((((class color)
        (background dark))
       (:foreground "ForestGreen"))
***************
*** 1243,1248 ****
--- 1261,1268 ----
       (:bold t)))
    "Face used for displaying MML."
    :group 'message-faces)
+ ;; backward-compatibility alias
+ (put 'message-mml-face 'face-alias 'message-mml)
  
  (defun message-font-lock-make-header-matcher (regexp)
    (let ((form
***************
*** 1266,1306 ****
    (let ((content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)\n?"))
      `((,(message-font-lock-make-header-matcher
         (concat "^\\([Tt]o:\\)" content))
!        (1 'message-header-name-face)
!        (2 'message-header-to-face nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\(^[GBF]?[Cc][Cc]:\\|^[Rr]eply-[Tt]o:\\)" content))
!        (1 'message-header-name-face)
!        (2 'message-header-cc-face nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\([Ss]ubject:\\)" content))
!        (1 'message-header-name-face)
!        (2 'message-header-subject-face nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content))
!        (1 'message-header-name-face)
!        (2 'message-header-newsgroups-face nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\([A-Z][^: \n\t]+:\\)" content))
!        (1 'message-header-name-face)
!        (2 'message-header-other-face nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\(X-[A-Za-z0-9-]+:\\|In-Reply-To:\\)" content))
!        (1 'message-header-name-face)
!        (2 'message-header-name-face))
        ,@(if (and mail-header-separator
                 (not (equal mail-header-separator "")))
            `((,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$")
!              1 'message-separator-face))
          nil)
        ((lambda (limit)
         (re-search-forward (concat "^\\("
                                    message-cite-prefix-regexp
                                    "\\).*")
                            limit t))
!        (0 'message-cited-text-face))
        ("<#/?\\(multipart\\|part\\|external\\|mml\\|secure\\)[^>]*>"
!        (0 'message-mml-face))))
    "Additional expressions to highlight in Message mode.")
  
  
--- 1286,1326 ----
    (let ((content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)\n?"))
      `((,(message-font-lock-make-header-matcher
         (concat "^\\([Tt]o:\\)" content))
!        (1 'message-header-name)
!        (2 'message-header-to nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\(^[GBF]?[Cc][Cc]:\\|^[Rr]eply-[Tt]o:\\)" content))
!        (1 'message-header-name)
!        (2 'message-header-cc nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\([Ss]ubject:\\)" content))
!        (1 'message-header-name)
!        (2 'message-header-subject nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content))
!        (1 'message-header-name)
!        (2 'message-header-newsgroups nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\([A-Z][^: \n\t]+:\\)" content))
!        (1 'message-header-name)
!        (2 'message-header-other nil t))
        (,(message-font-lock-make-header-matcher
         (concat "^\\(X-[A-Za-z0-9-]+:\\|In-Reply-To:\\)" content))
!        (1 'message-header-name)
!        (2 'message-header-name))
        ,@(if (and mail-header-separator
                 (not (equal mail-header-separator "")))
            `((,(concat "^\\(" (regexp-quote mail-header-separator) "\\)$")
!              1 'message-separator))
          nil)
        ((lambda (limit)
         (re-search-forward (concat "^\\("
                                    message-cite-prefix-regexp
                                    "\\).*")
                            limit t))
!        (0 'message-cited-text))
        ("<#/?\\(multipart\\|part\\|external\\|mml\\|secure\\)[^>]*>"
!        (0 'message-mml))))
    "Additional expressions to highlight in Message mode.")