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 18:23:17 +0000 Message-ID: <878sxc6nze.fsf@tcd.ie> References: <86zhptjnl4.fsf@zoho.eu> <87wokw3n1e.fsf@ericabrahamsen.net> <8336nkw2os.fsf@gnu.org> <875zsg86c5.fsf@tcd.ie> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="182932"; 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 19:24:14 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 1h5wvk-000lRN-0t for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Mar 2019 19:24:12 +0100 Original-Received: from localhost ([127.0.0.1]:45702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5wvi-00013m-PR for geb-bug-gnu-emacs@m.gmane.org; Mon, 18 Mar 2019 14:24:10 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:38385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5wvb-00013V-Qe for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 14:24:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5wvb-00029Y-05 for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 14:24:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5wva-00029L-K0 for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 14:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h5wva-00020y-DB for bug-gnu-emacs@gnu.org; Mon, 18 Mar 2019 14:24:02 -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 18:24:02 +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.15529334087695 (code B ref 34898); Mon, 18 Mar 2019 18:24:02 +0000 Original-Received: (at 34898) by debbugs.gnu.org; 18 Mar 2019 18:23:28 +0000 Original-Received: from localhost ([127.0.0.1]:49188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5wv2-000203-60 for submit@debbugs.gnu.org; Mon, 18 Mar 2019 14:23:28 -0400 Original-Received: from mail-ed1-f44.google.com ([209.85.208.44]:44807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h5wv0-0001zp-4h for 34898@debbugs.gnu.org; Mon, 18 Mar 2019 14:23:26 -0400 Original-Received: by mail-ed1-f44.google.com with SMTP id x10so11216955edh.11 for <34898@debbugs.gnu.org>; Mon, 18 Mar 2019 11:23:26 -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=2XxMhKupe5FH1kXqkEFYb4cD0XcDHPsLu1tphSvIZyo=; b=zE416BSjbq0w3kVQgaEojAIie/ZOUSGJfUDJn8VCXwvSnI+0jRL/Bi0CJu4WwhKlLi P4PEuw5bZzGZFK8q1KA6BDNw/P7uCsOD1VKEujcIYFr0QxFjUCucy8Nkh45u7gK1VRBo y0xIxTQqmif/c5uXM4LE7fNcxOKUQRPiFvjcnEzwtRa+Yd/wFBzCtuWsSE4JDwBQr7H6 y6lhYhVh/lTbZ7/8OxikaHaqQFAyNTG91kLi5q/SyUtw5D7pye0PldMLdFOEdNzq4i0N u5Jm8VEwvfFe9dLwFY4ve/HTxc4sLBAetFh9bY2VvkgTh7ddeJypwQZ5jPKPcoN0EbJJ WDqg== 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=2XxMhKupe5FH1kXqkEFYb4cD0XcDHPsLu1tphSvIZyo=; b=rJlFrZ5a/UOnI6bxTgWWrI9jHk+/Aw4lzGw/hZMZ2sQyFl+s/zVO2woh1feYlGHt5D /0l2HMsJN76odXjAAy1UCjz8rkOoAh+mWRjy1N7RdFJyTCf1Zuv4/KzfgJFQP9/31ue2 muTPBHcYP+Djm1GiKtzrxj8MmgULdSiHZYkiyk1D3oCseplYuD16IQOFhd/DiKN7WeLq /eNOieWUV0VO1vxd/fUYMUTNMYAdiKhQBgHzKCJZOafYii9MH4Y6oViAVrhjbBNKSrCD I6Vaw/mCTzm3k9CCLlN5QOuNb5d/6cnKtXQ+CNN+b0+j/QCwba+tSHF305OutTUrdzwa EHLQ== X-Gm-Message-State: APjAAAU+YBRfxDkWNa37v/IlawGz39AzA5t+DmmqW8HgnJosVFzX5CGG EmgyXtxxxhTm0ZU9jMtfEZiMEA== X-Google-Smtp-Source: APXvYqxoo4ZbMnw6NIT+Z9JPGnHAqXGMDJW505wCziaV4k/2PoFHV/fQbeQBrtzxijf1XIYonGRjDQ== X-Received: by 2002:a17:906:3952:: with SMTP id g18mr11615462eje.247.1552933400238; Mon, 18 Mar 2019 11:23:20 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:20c2:134e:4f3a:683a]) by smtp.gmail.com with ESMTPSA id l15sm2591643ejn.77.2019.03.18.11.23.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 18 Mar 2019 11:23:19 -0700 (PDT) In-Reply-To: <875zsg86c5.fsf@tcd.ie> (Basil L. Contovounesios's message of "Mon, 18 Mar 2019 17:01:30 +0000") 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:156463 Archived-At: "Basil L. Contovounesios" writes: > Actually, I think message-font-lock-keywords can do better: > > 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) ^^^ Sorry, that should be 0. > + (,(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 > > > 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