Synch to Gnus 200309010904.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9f5c83..cb283e9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-01  Simon Josefsson  <jas@extundo.com>
+
+       * mml.el (mml-insert-mime-headers-always): New variable.
+       (mml-insert-mime-headers): Use it.  Based on (tiny) patch from
+       Lars Balker Rasmussen <lars@balker.org>.
+
 2003-08-30  Simon Josefsson  <jas@extundo.com>
 
        * mail-source.el (mail-source-fetch-imap): Pass correct buffer to

diff --git a/lisp/mml.el b/lisp/mml.el
index 929d5c2..bf992ca 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -54,6 +54,12 @@ These parameters are generated in Content-Disposition header if exists."
   :type '(repeat (symbol :tag "Parameter"))
   :group 'message)
 
+(defcustom mml-insert-mime-headers-always nil
+  "If non-nil, always put Content-Type: text/plain at top of empty parts.
+It is necessary to work against a bug in certain clients."
+  :type 'boolean
+  :group 'message)
+
 (defvar mml-tweak-type-alist nil
   "A list of (TYPE . FUNCTION) for tweaking MML parts.
 TYPE is a string containing a regexp to match the MIME type.  FUNCTION
@@ -608,7 +614,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
     (when (or charset
              parameters
              flowed
-             (not (equal type mml-generate-default-type)))
+             (not (equal type mml-generate-default-type))
+             mml-insert-mime-headers-always)
       (when (consp charset)
        (error
         "Can't encode a part with several charsets"))