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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9287891b4c7c912b364f132be3eb8c33e7ff76eb..e1aaa4af7d0d423c4a4e25890806ce420c83549e 100644 (file)
--- 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 87ca0d20ccf1a94a3ff1f437dd592c96d3f4f2a9..f21a143a4c8a8210a15e3e5ff3c7fe85d07236b2 100644 (file)
--- 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