Synch to No Gnus 200411120157.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78152a4..7b4c96f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-11  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
+
+       * message.el (message-use-alternative-email-as-from): Examine the
+       From header as well; use message-make-from in order to include a
+       user's full name.
+
 2004-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-emphasis-alist): Don't hide asterisks by

diff --git a/lisp/message.el b/lisp/message.el
index 771f300..69f61f4 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7634,7 +7634,7 @@ regexp VARSTR."
 
 (defun message-use-alternative-email-as-from ()
   (require 'mail-utils)
-  (let* ((fields '("To" "Cc"))
+  (let* ((fields '("To" "Cc" "From"))
         (emails
          (split-string
           (mail-strip-quoted-names
@@ -7648,7 +7648,8 @@ regexp VARSTR."
       (pop emails))
     (unless (or (not email) (equal email user-mail-address))
       (goto-char (point-max))
-      (insert "From: " email "\n"))))
+      (insert "From: " (let ((user-mail-address email)) (message-make-from))
+             "\n"))))
 
 (defun message-options-get (symbol)
   (cdr (assq symbol message-options)))