Synch to No Gnus 200509020755.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d649471..cbac8a8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2005-09-02  Hrvoje Niksic  <hniksic@xemacs.org>
+
+       * mm-encode.el (mm-encode-content-transfer-encoding): Likewise
+       when encoding.
+
+       * mm-bodies.el (mm-decode-content-transfer-encoding):
+       De-canonicalize CRLF for all text content types, not just
+       text/plain.
+
 2005-09-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-part-wrapper): Error if there's no

diff --git a/lisp/mm-bodies.el b/lisp/mm-bodies.el
index e9c6c4a..5f1c93b 100644 (file)
--- a/lisp/mm-bodies.el
+++ b/lisp/mm-bodies.el
@@ -226,7 +226,7 @@ If TYPE is `text/plain' CRLF->LF translation may occur."
         nil))
     (when (and
           (memq encoding '(base64 x-uuencode x-uue x-binhex x-yenc))
-          (equal type "text/plain"))
+          (string-match "\\`text/" type))
       (goto-char (point-min))
       (while (search-forward "\r\n" nil t)
        (replace-match "\n" t t)))))

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index 6eb020a..cb6c396 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -118,7 +118,7 @@ ENCODING can be: nil (do nothing); one of `quoted-printable', `base64';
     ;; Likewise base64 below.
     (quoted-printable-encode-region (point-min) (point-max) t))
    ((eq encoding 'base64)
-    (when (equal type "text/plain")
+    (when (string-match "\\`text/" type)
       (goto-char (point-min))
       (while (search-forward "\n" nil t)
        (replace-match "\r\n" t t)))