diff lisp/gnus/message.el @ 79313:f4c90d55f00f

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 266-268) - Merge from emacs--rel--22 - Update from CVS 2007-11-01 Reiner Steib <[e-mail]> * lisp/gnus/mm-util.el (mm-charset-eval-alist): Mark as risky local variable. * lisp/gnus/gnus.el (gnus-group-charter-alist): Mark as risky local variable. * lisp/gnus/gnus-art.el (gnus-button-alist, gnus-header-button-alist): Mark as risky local variable. * lisp/gnus/gnus-group.el (gnus-group-icon-list): Mark as risky local variable. 2007-11-01 ARISAWA Akihiro <[e-mail]> (tiny change) * lisp/gnus/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. [ Backported bug fix from No Gnus. ] 2007-10-30 Reiner Steib <[e-mail]> * lisp/gnus/qp.el (quoted-printable-decode-string): Fix typo in doc string. 2007-10-30 Katsumi Yamaoka <[e-mail]> * lisp/gnus/gnus-ems.el (gnus-x-splash): Work even if there's no scroll bar. Revision: [e-mail]/emacs--rel--22--patch-143

--- a/lisp/gnus/message.el	Thu Nov 01 08:12:58 2007 +0000
+++ b/lisp/gnus/message.el	Fri Nov 02 01:39:46 2007 +0000
@@ -7164,7 +7164,7 @@
 address in `message-alternative-emails', looking at To, Cc and
 From headers in the original article."
   (require 'mail-utils)
-  (let* ((fields '("To" "Cc"))
+  (let* ((fields '("To" "Cc" "From"))
 	 (emails
 	  (split-string
 	   (mail-strip-quoted-names
@@ -7179,7 +7179,8 @@
     (unless (or (not email) (equal email user-mail-address))
       (message-remove-header "From")
       (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)))