aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/rmail.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8660bd5b764..1a64321c5f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-06-23 Richard Stallman <rms@gnu.org>
2
3 * mail/rmail.el (rmail-retry-ignored-headers): Add message-id.
4
12011-06-23 Michael Albinus <michael.albinus@gmx.de> 52011-06-23 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * net/tramp-sh.el (tramp-method-out-of-band-p): Check, whether 7 * net/tramp-sh.el (tramp-method-out-of-band-p): Check, whether
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index ccae59eff26..a65c8376642 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -349,7 +349,7 @@ If nil, display all header fields except those matched by
349 :group 'rmail-headers) 349 :group 'rmail-headers)
350 350
351;;;###autoload 351;;;###autoload
352(defcustom rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:") 352(defcustom rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:\\|message-id:")
353 "Headers that should be stripped when retrying a failed message." 353 "Headers that should be stripped when retrying a failed message."
354 :type '(choice regexp (const nil :tag "None")) 354 :type '(choice regexp (const nil :tag "None"))
355 :group 'rmail-headers 355 :group 'rmail-headers