Merged from emacs@sv.gnu.org.

[gnu-emacs] / lisp / gnus / mm-encode.el

diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 43eb619368ef28b3786909d6eb9a873d39819ff4..5ea2d7dd1b680527c2173c86632397d4d22ed645 100644 (file)
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -1,6 +1,7 @@
 ;;; mm-encode.el --- Functions for encoding MIME things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
-;;        Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -117,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)))