Expand email abbrevs in X-Debbugs-Cc header.

* lisp/mail/mailabbrev.el (mail-abbrev-mode-regexp):
* lisp/mail/mailalias.el (mail-address-field-regexp)
(mail-complete-alist): Add "X-Debbugs-Cc" to headers where email
aliases should be expanded, for compatibility with emacsbug.el.

(cherry picked from commit d656be9794dcce02fb0b2ac3f5a955ddbe57040d)

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index c8006294a7d74e99c4fc25dfd803c8fda2156bbe..16e9d6f1bea755f82549a2e4680722875e72b337 100644 (file)
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -410,7 +410,7 @@ with a space."
 ;;; Syntax tables and abbrev-expansion
 
 (defcustom mail-abbrev-mode-regexp
-  "^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\):"
+  "^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\|X-Debbugs-Cc\\):"
   "Regexp matching mail headers in which mail abbrevs should be expanded.
 This string will be handed to `looking-at' with point at the beginning
 of the current line; if it matches, abbrev mode will be turned on, otherwise

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index cce2fcb104d0ea0c5ea28899f4429eb7b8b12e98..ca4ff67a6ac2b74f69f968cd1a61995b2f492b9c 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -50,7 +50,7 @@
 When t this still needs to be initialized.")
 
 (defvar mail-address-field-regexp
-  "^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\):")
+  "^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\|X-Debbugs-Cc\\):")
 
 ;; `pattern' is bound dynamically before evaluating the forms in
 ;; `mail-complete-alist' and may be part of user customizations of
@@ -61,7 +61,7 @@ When t this still needs to be initialized.")
 (defcustom mail-complete-alist
   ;; Don't refer to mail-address-field-regexp here;
   ;; that confuses some things such as cus-dep.el.
-  '(("^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\):"
+  '(("^\\(Resent-\\)?\\(To\\|From\\|Cc\\|Bcc\\|Reply-To\\|X-Debbugs-Cc\\):"
      . (mail-get-names pattern))
     ("Newsgroups:" . (if (boundp 'gnus-active-hashtb)
                          gnus-active-hashtb