From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.bugs Subject: bug#34898: 24.4; `message-separator' face only works for default value of `mail-header-separator' Date: Mon, 18 Mar 2019 17:01:30 +0000 Message-ID: <875zsg86c5.fsf@tcd.ie> References: <86zhptjnl4.fsf@zoho.eu> <87wokw3n1e.fsf@ericabrahamsen.net> <8336nkw2os.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="80249"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Eric Abrahamsen , 34898@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Mar 18 18:03:08 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1h5vfI-000KjR-E5 for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Mar 2019 18:03:08 +0100 Original-Received: from localhost ([127.0.0.1]:44615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5vfH-0007g5-Dz for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Mar 2019 13:03:07 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:50902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5veG-0007Dc-2c for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 13:02:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5veE-0002Fn-Q7 for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 13:02:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5veD-0002Ey-QQ for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 13:02:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h5veD-0008Tu-Lc for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 13:02:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 18 Mar 2019 17:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34898 X-GNU-PR-Package: emacs Original-Received: via spool by 34898-submit@debbugs.gnu.org id=B34898.155292850132570 (code B ref 34898); Mon, 18 Mar 2019 17:02:01 +0000 Original-Received: (at 34898) by debbugs.gnu.org; 18 Mar 2019 17:01:41 +0000 Original-Received: from localhost ([127.0.0.1]:49106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5vds-0008TG-Iz for submit@debbugs.gnu.org; Mon, 18 Mar 2019 13:01:40 -0400 Original-Received: from mail-ed1-f41.google.com ([209.85.208.41]:36669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5vdq-0008T0-9E for 34898@debbugs.gnu.org; Mon, 18 Mar 2019 13:01:39 -0400 Original-Received: by mail-ed1-f41.google.com with SMTP id e4so14187213edi.3 for <34898@debbugs.gnu.org>; Mon, 18 Mar 2019 10:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=OOGRg8cB/e73R428+jWTx7T4DTp54dVBbgZDKG0IK3M=; b=oO1W+7LS63oUodNH062mQxp6gL0GSU7rjgB9+acpZ180o6SEbsXPC2ojXMxrJ87Tmf kxBmFNoWBwU2+utTk94BBD2kY1FovHiv5UA8SY/ACMGuI63lFX9n6NmlYo5MomdTV2Ch vvp5Q+rnRXHm7Pa7Eq51Rb9rGX3cU9NqI5fbeDlwx9w+KRHWTSmvbfW9EVHNErNF26bA 1+4leLR/Bn3gMa2MpygfMVnaAOVDPDGeA513Gkv1UZq/5KqwScKrtKQl9mtu3Vc11bqY FOy7XMnbt0NreGg9i3eArOlkQmMxCbvVEnBoCzDb50/a2tef+6j9K0nb1Jui/ljCoKIb YpQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=OOGRg8cB/e73R428+jWTx7T4DTp54dVBbgZDKG0IK3M=; b=KXfhu3Dk3R4Il3HD5Q2aPQgDgEAjIQl9dB7ITSe9PzG29Nzo8jBmhDGcehTOjvsiLp DPJb4bmNwpHjxcC3ciJDO4PSHwwSjBVJZq+cUBq234xltVJpnq6ELoITw5pzt16rYl5K 8YLwxfQl4tPyAc9nf6GaeaNmg9GDVEcG8tlhzcRUh8Wdjz/EyQFRAqK6NDZ16VQLvi8+ 15muV2O1hWLpemnNvpC4e6Nc+iIB3a6HP/jwKl5GEWLK8BQlfRKvEVsj1/dD9JjKW6mo 05Dg8ffzUYHmOUipXUWybrigrfmA+6lL6zTrAhiq22ynwIq7jfAFGulGEaz6pgc2uONh 11Og== X-Gm-Message-State: APjAAAWeh71jRI/WFxNPc8i3oNWOq6FePUowjdZIDOu7kLO7Dx42wX9K F4u0QFnTCDwsfDKJ6C1GeNtmvQ== X-Google-Smtp-Source: APXvYqz2sdDPTiB0iOIxb5mjwXeopcGgW3AJ68JmIg59VRgUXTtTSMIdtqApRJK4asHL/+d84XAjxg== X-Received: by 2002:a50:c251:: with SMTP id t17mr13902774edf.179.1552928492456; Mon, 18 Mar 2019 10:01:32 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:20c2:134e:4f3a:683a]) by smtp.gmail.com with ESMTPSA id i5sm2541901eja.47.2019.03.18.10.01.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 18 Mar 2019 10:01:31 -0700 (PDT) In-Reply-To: <8336nkw2os.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 18 Mar 2019 18:46:27 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:156457 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Eric Abrahamsen >> 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: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Fix-mail-header-separator-font-lock-in-message.el.patch >From 0aa67e4ac6cd2ac93c05c7b7bec486c5fefd12dd Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Mon, 18 Mar 2019 15:09:45 +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 c491f16dd8..079a13c706 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))) + 1 '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 --=-=-= Content-Type: text/plain 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. WDYT? -- Basil --=-=-=--