Re: Facilitate Customisation of Message-Mode Header Completion Behaviour

[Alexander Adolf]

Alexander Adolf <alexander.adolf@condition-alpha.com> writes:

> Alexander Adolf <alexander.adolf@condition-alpha.com> writes:
>
>> [...]
>> +(defcustom message-email-recipient-header-regexp
>> +  "^\\([^ 
>> :]*-\\)?\\(To\\|B?Cc\\|From\\|Reply-to\\|Mail-Followup-To\\|Mail-Copies-To\\):.*?
>>  *\\([^,;]*\\)"
>> +  "Regexp matching headers that list email addresses."
>>    :group 'message
>>    :type 'regexp)
>> [...]
>
> The regular expression should have ended with the colon (':'), that is
>
>       "^\\([^ 
> :]*-\\)?\\(To\\|B?Cc\\|From\\|Reply-to\\|Mail-Followup-To\\|Mail-Copies-To\\):"
>
> Apologies for the slip. My bad!

Updated patch:

>From d40a6d084b975a36173909a33b6da0adfe7a2698 Mon Sep 17 00:00:00 2001
From: Alexander Adolf <alexander.adolf@condition-alpha.com>
Date: Wed, 9 Mar 2022 15:26:55 +0100
Subject: [PATCH] Facilitate Customisation of Message-Mode Header Completion
 Behaviour

This commit refactors the regular expression used for recognising
message headers containing email addresses into a new defcustom. This
brings it on par with the regular expression for recognising headers
containing newsgroup names. At the same time, the regular expression
for email address headers is extended to match additional headers.

For one, this allows users to customise the regular expression for
email headers, which was not possible before. On the other hand it
facilitates customising the value of message-completion-alist, since
having the regular expression (which is the car of the conses in
message-completion-alist) in a variable makes changing the function to
be called (which is the cdr of the conses in message-completion-alist)
easier.
---
 lisp/gnus/message.el | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index a5b3d40467..9e7dc3a6e0 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -8265,17 +8265,23 @@ When FORCE, rebuild the tool bar."
                                    'message-mode-map))))
   message-tool-bar-map)
 
-;;; Group name completion.
+;;; Group name and email address completion.
 
 (defcustom message-newgroups-header-regexp
   "^\\(Newsgroups\\|Followup-To\\|Posted-To\\|Gcc\\):"
-  "Regexp that match headers that lists groups."
+  "Regexp matching headers that list groups."
+  :group 'message
+  :type 'regexp)
+
+(defcustom message-email-recipient-header-regexp
+  "^\\([^ 
:]*-\\)?\\(To\\|B?Cc\\|From\\|Reply-to\\|Mail-Followup-To\\|Mail-Copies-To\\):"
+  "Regexp matching headers that list email addresses."
   :group 'message
   :type 'regexp)
 
 (defcustom message-completion-alist
   `((,message-newgroups-header-regexp . ,#'message-expand-group)
-    ("^\\([^ :]*-\\)?\\(To\\|B?Cc\\|From\\):" . ,#'message-expand-name))
+    (,message-email-recipient-header-regexp . ,#'message-expand-name))
   "Alist of (RE . FUN).  Use FUN for completion on header lines matching RE.
 FUN should be a function that obeys the same rules as those
 of `completion-at-point-functions'."
-- 
2.35.1