rmail-retry-failure must avoid mime processing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d56e0e88f913e88ebf8ff3fc18f635e160eefd69..6232886b88b9a71a45847f2d9e6f84ab5aac0a10 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-17  Richard Stallman  <rms@gnu.org>
 
+       * mail/rmail.el (rmail-retry-failure): Turn off mime processing first.
+
        * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key.
 
 2012-09-17  Chong Yidong  <cyd@gnu.org>

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d88862b2d47f7c651fbfde40bcec0f258fe84ba4..5606e71dea431455d186bfaddc5a7c3f21585fd4 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4068,6 +4068,13 @@ The variable `rmail-retry-ignored-headers' is a regular expression
 specifying headers which should not be copied into the new message."
   (interactive)
   (require 'mail-utils)
+  (if rmail-enable-mime
+      (with-current-buffer rmail-buffer
+       (if (rmail-mime-message-p)
+           (let ((rmail-mime-mbox-buffer rmail-view-buffer)
+                 (rmail-mime-view-buffer rmail-buffer))
+             (rmail-mime-toggle-raw 'raw)))))
+
   (let ((rmail-this-buffer (current-buffer))
        (msgnum rmail-current-message)
        bounce-start bounce-end bounce-indent resending
@@ -4598,7 +4605,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 \f
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "cd7656f82944d0b92b0d093a5f3a4c36")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "0c18b83f914803d1216e1a9df7ea5275")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\