>From d7d8b44cc497f2611461693b4c5591b98b8f8c42 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Mon, 18 Mar 2019 18:21:15 +0000 Subject: [PATCH] Fix mail-header-separator font lock in message.el * lisp/gnus/message.el (message-font-lock-keywords): Dynamically font lock mail-header-separator, in case it changes. (bug#34898) --- lisp/gnus/message.el | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index c8b6f0ee68..461c64b2c3 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1599,19 +1599,21 @@ message-font-lock-keywords (progn (goto-char (match-beginning 0)) (match-end 0)) nil (1 'message-header-name) (2 'message-header-other nil t))) - ,@(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)))) + (,(lambda (limit) + (and mail-header-separator + (not (equal mail-header-separator "")) + (re-search-forward + (concat "^" (regexp-quote mail-header-separator) "$") + limit t))) + 0 'message-separator) + (,(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.") (defvar message-face-alist -- 2.20.1