From: Glenn Morris <rgm@gnu.org>
Date: Mon, 26 Jan 2009 02:06:58 +0000 (+0000)
Subject: (rmail-reply): Don't include Resent-To and Resent-Cc in replies.  (Bug#512)
X-Git-Tag: emacs-pretest-23.0.90~202
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac120e6dbf0c16ceaad7f5ded17af1b5a1b5ead6;p=emacs.git

(rmail-reply): Don't include Resent-To and Resent-Cc in replies.  (Bug#512)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9287891b4c7..e1aaa4af7d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-26  Glenn Morris  <rgm@gnu.org>
+
+	* mail/rmail.el (rmail-reply): Don't include Resent-To and Resent-Cc in
+	replies.  (Bug#512)
+
 2009-01-25  Ulf Jasper  <ulf.jasper@web.de>
 
 	* calendar/icalendar.el (icalendar-uid-format): Fixed doc string.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 87ca0d20ccf..f21a143a4c8 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3211,9 +3211,10 @@ use \\[mail-yank-original] to yank the original message into it."
 	      message-id (mail-fetch-field "message-id")
 	      references (mail-fetch-field "references" nil nil t)
 	      resent-reply-to (mail-fetch-field "resent-reply-to" nil t)
-	      resent-cc (and (not just-sender)
-			     (mail-fetch-field "resent-cc" nil t))
-	      resent-to (or (mail-fetch-field "resent-to" nil t) "")
+	      ;; Bug#512.  It's inappropriate to reply to these addresses.
+;;;	      resent-cc (and (not just-sender)
+;;;			     (mail-fetch-field "resent-cc" nil t))
+;;;	      resent-to (or (mail-fetch-field "resent-to" nil t) "")
 ;;;	      resent-subject (mail-fetch-field "resent-subject")
 ;;;	      resent-date (mail-fetch-field "resent-date")
 ;;;	      resent-message-id (mail-fetch-field "resent-message-id")
@@ -3227,14 +3228,15 @@ use \\[mail-yank-original] to yank the original message into it."
 		  to (or (mail-fetch-field "to" nil t) ""))))))
 
     ;; Merge the resent-to and resent-cc into the to and cc.
-    (if (and resent-to (not (equal resent-to "")))
-	(if (not (equal to ""))
-	    (setq to (concat to ", " resent-to))
-	  (setq to resent-to)))
-    (if (and resent-cc (not (equal resent-cc "")))
-	(if (not (equal cc ""))
-	    (setq cc (concat cc ", " resent-cc))
-	  (setq cc resent-cc)))
+    ;; Bug#512.  It's inappropriate to reply to these addresses.
+;;;    (if (and resent-to (not (equal resent-to "")))
+;;;	(if (not (equal to ""))
+;;;	    (setq to (concat to ", " resent-to))
+;;;	  (setq to resent-to)))
+;;;    (if (and resent-cc (not (equal resent-cc "")))
+;;;	(if (not (equal cc ""))
+;;;	    (setq cc (concat cc ", " resent-cc))
+;;;	  (setq cc resent-cc)))
     ;; Add `Re: ' to subject if not there already.
     (and (stringp subject)
 	 (setq subject