Synch to Gnus 200309172121.

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/message.el b/lisp/message.el
index 8c4ec03..b3d2f52 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -593,7 +593,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"