From: Richard M. Stallman Date: Wed, 18 Mar 2009 21:47:23 +0000 (+0000) Subject: (rmail-retry-ignored-headers): Add usual mime headers. X-Git-Tag: emacs-pretest-23.0.92~139 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6de8838259eb359c7c94d954aab615fabcf327b;p=emacs.git (rmail-retry-ignored-headers): Add usual mime headers. (rmail-retry-failure): Undo previous change. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22495598a6c..6164a1e2319 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-03-18 Richard M Stallman + + * mail/rmail.el (rmail-retry-ignored-headers): Add usual mime headers. + (rmail-retry-failure): Undo previous change. + 2009-03-18 Kenichi Handa * international/mule.el (after-insert-file-set-coding): diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 32349dbb0f0..053f88629ff 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -371,7 +371,7 @@ If nil, display all header fields except those matched by :group 'rmail-headers) ;;;###autoload -(defcustom rmail-retry-ignored-headers "^x-authentication-warning:" +(defcustom rmail-retry-ignored-headers "^x-authentication-warning:\\|content-type:\\|content-transfer-encoding:\\|mime-version:" "Headers that should be stripped when retrying a failed message." :type '(choice regexp (const nil :tag "None")) :group 'rmail-headers) @@ -3762,7 +3762,6 @@ specifying headers which should not be copied into the new message." (mail-sendmail-delimit-header) (save-restriction (narrow-to-region (point-min) (mail-header-end)) - (rmail-delete-headers rmail-ignored-headers) (rmail-delete-headers rmail-retry-ignored-headers) (rmail-delete-headers "^\\(sender\\|return-path\\|received\\):") (setq resending (mail-fetch-field "resent-to"))