[Emacs-diffs] /srv/bzr/emacs/trunk r110072: rmail-retry-failure must avoid mime processing.

[Richard Stallman]

------------------------------------------------------------
revno: 110072
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-17 07:44:48 -0400
message:
  rmail-retry-failure must avoid mime processing.
modified:
  lisp/ChangeLog
  lisp/mail/rmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-17 09:49:55 +0000
+++ b/lisp/ChangeLog    2012-09-17 11:44:48 +0000
@@ -1,5 +1,7 @@
 2012-09-17  Richard Stallman  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2012-08-17 20:38:47 +0000
+++ b/lisp/mail/rmail.el        2012-09-17 11:44:48 +0000
@@ -4068,6 +4068,13 @@
 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 @@
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"cd7656f82944d0b92b0d093a5f3a4c36")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" 
"0c18b83f914803d1216e1a9df7ea5275")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\