bug#34898: 24.4; `message-separator' face only works for default value of `mail-header-separator'

["Basil L. Contovounesios" <contovob@tcd.ie>]

[-- Attachment #1: Type: text/plain, Size: 47 bytes --]

tags 34898 patch
severity 34898 wishlist
quit


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-mail-header-separator-font-lock-in-message.el.patch --]
[-- Type: text/x-diff, Size: 1997 bytes --]

From d7d8b44cc497f2611461693b4c5591b98b8f8c42 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
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


[-- Attachment #3: Type: text/plain, Size: 1160 bytes --]


"Basil L. Contovounesios" <contovob@tcd.ie> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>>> From: Eric Abrahamsen <eric@ericabrahamsen.net>
>>> Date: Sun, 17 Mar 2019 19:59:41 -0700
>>> 
>>> >     So it's a bug.
>>> 
>>> The value of `mail-header-separator' gets added to
>>> `message-font-lock-keywords', which does the actual fontification. Using
>>> setq to change the value of `mail-header-separator' did not change the
>>> font lock keyword, despite setting the variable before message.el is
>>> loaded (or is it pre-loaded?). Using the customize interface to set
>>> `mail-header-separator' *does* work as expected.
>>
>> Right.  So I don't think there's a bug here.
>
> Actually, I think message-font-lock-keywords can do better:

[...]

> This is similar to what mail-font-lock-keywords does in
> lisp/mail/sendmail.el, namely adapt the font lock keywords to changes in
> mail-header-separator.

For reasons explained elsewhere in this thread, I think the current
behaviour is a shortcoming, even if it's not considered a bug.  I would
like to push my patch which addresses this, and which I reattach for
convenience.  WDYT?

Thanks,

-- 
Basil