* gnus-msg.el (gnus-summary-resend-message-edit): Don't convert

to MML.  MIME -> MML -> MIME does not work for PGP/MIME.

* message.el (message-bounce, message-forward-show-mml): do.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1edfec2..4669c0d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-17  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-msg.el (gnus-summary-resend-message-edit): Don't convert
+       to MML.  MIME -> MML -> MIME does not work for PGP/MIME.
+
+       * message.el (message-bounce, message-forward-show-mml): do.
+       
 2003-09-13  Jesper Harder  <harder@ifa.au.dk>
 
        * rfc2047.el (rfc2047-charset-encoding-alist): Add viscii.

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 7697e21..0b34f3c 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1312,7 +1312,6 @@ composing a new message."
        ;; Get a normal message buffer.
        (message-pop-to-buffer (message-buffer-name "Resend" to))
        (insert-buffer-substring cur)
-       (mime-to-mml)
        (message-narrow-to-head-1)
        ;; Gnus will generate a new one when sending.
        (message-remove-header "Message-ID")

diff --git a/lisp/message.el b/lisp/message.el
index b133f5e..d93da25 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -467,7 +467,7 @@ Otherwise, directly inline the old message in the forwarded message."
   :group 'message-forwarding
   :type 'boolean)
 
-(defcustom message-forward-show-mml t
+(defcustom message-forward-show-mml nil
   "*Non-nil means show forwarded messages as mml.
 Otherwise, forwarded messages are unchanged."
   :version "21.1"
@@ -6150,7 +6150,6 @@ you."
        (when (re-search-backward "^.?From .*\n" nil t)
          (delete-region (match-beginning 0) (match-end 0)))))
     (mm-enable-multibyte)
-    (mime-to-mml)
     (save-restriction
       (message-narrow-to-head-1)
       (message-remove-header message-ignored-bounced-headers t)