(expand-mail-aliases): Expand aliases in

From and Reply-to headers as well, plus the Resent- variants.

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index cedc40ab9a9c62363f03bd7e0d1fb47303e824c3..2f06c63e49869313409652258268f824c99faf78 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -35,7 +35,9 @@
 ;; only if some mail aliases are defined.
 (defun expand-mail-aliases (beg end &optional exclude)
   "Expand all mail aliases in suitable header fields found between BEG and END.
-Suitable header fields are `To', `Cc' and `Bcc' and their `Resent-' variants.
+Suitable header fields are `To', `From', `CC' and `BCC', `Reply-to', and
+their `Resent-' variants.
+
 Optional second arg EXCLUDE may be a regular expression defining text to be
 removed from alias expansions."
   (sendmail-synch-aliases)
@@ -45,7 +47,7 @@ removed from alias expansions."
   (setq end (set-marker (make-marker) end))
   (let ((case-fold-search nil))
     (while (let ((case-fold-search t))
-            (re-search-forward "^\\(to\\|cc\\|bcc\\|resent-to\\|resent-cc\\|resent-bcc\\):" end t))
+            (re-search-forward "^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):" end t))
       (skip-chars-forward " \t")
       (let ((beg1 (point))
            end1 pos epos seplen