- (cite-suffix (concat cite-prefix "0-9_.@-")))
- (list '("^\\(To:\\)[ \t]*\\(.+\\)?"
- (1 'message-header-name-face)
- (2 'message-header-to-face nil t))
- '("^\\(^[GBF]?[Cc][Cc]:\\|^Reply-To:\\)[ \t]*\\(.+\\)?"
- (1 'message-header-name-face)
- (2 'message-header-cc-face nil t))
- '("^\\(Subject:\\)[ \t]*\\(.+\\)?"
- (1 'message-header-name-face)
- (2 'message-header-subject-face nil t))
- '("^\\(Newsgroups:\\|Followup-to:\\)[ \t]*\\(.+\\)?"
- (1 'message-header-name-face)
- (2 'message-header-newsgroups-face nil t))
- '("^\\([^: \n\t]+:\\)[ \t]*\\(.+\\)?"
- (1 'message-header-name-face)
- (2 'message-header-other-face nil t))
- (list (concat "^\\(" (regexp-quote mail-header-separator) "\\)$")
- 1 '(quote message-separator-face))
- `(,(concat "^[ \t]*"
- "\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
- "[>|}].*")
- (0 'message-cited-text-face))
- '("^\\(X-[A-Za-z0-9-]+\\|In-Reply-To\\):.*"
- (0 'message-header-xheader-face))))
+ (cite-suffix (concat cite-prefix "0-9_.@-"))
+ (content "[ \t]*\\(.+\\(\n[ \t].*\\)*\\)"))
+ `((,(concat "^\\([Tt]o:\\)" content)
+ (1 'message-header-name-face)
+ (2 'message-header-to-face nil t))
+ (,(concat "^\\(^[GBF]?[Cc][Cc]:\\|^[Rr]eply-[Tt]o:\\)" content)
+ (1 'message-header-name-face)
+ (2 'message-header-cc-face nil t))
+ (,(concat "^\\([Ss]ubject:\\)" content)
+ (1 'message-header-name-face)
+ (2 'message-header-subject-face nil t))
+ (,(concat "^\\([Nn]ewsgroups:\\|Followup-[Tt]o:\\)" content)
+ (1 'message-header-name-face)
+ (2 'message-header-newsgroups-face nil t))
+ (,(concat "^\\([A-Z][^: \n\t]+:\\)" content)
+ (1 'message-header-name-face)
+ (2 'message-header-other-face nil t))
+ (,(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)
+ (,(concat "^[ \t]*"
+ "\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
+ "[:>|}].*")
+ (0 'message-cited-text-face))))