From: yamaoka <yamaoka>
Date: Tue, 2 Aug 2005 01:47:40 +0000 (+0000)
Subject: Synch to No Gnus 200508020046.
X-Git-Tag: t-gnus-6_17_4-quimby-~440
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3513de72dabd14191e1c8b0bdd6f573b35503c72;p=elisp%2Fgnus.git-

Synch to No Gnus 200508020046.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fef87a7..7815225 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mml.el (mml-generate-mime-1): Make the content type default to
+	text/plain if the filename is not specified.
+
 2005-08-01  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-uu.el (gnus-uu-save-article): Use insert-buffer-substring
diff --git a/lisp/mml.el b/lisp/mml.el
index cc16def..ae8e0ef 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -413,8 +413,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	(let* ((raw (cdr (assq 'raw cont)))
 	       (filename (cdr (assq 'filename cont)))
 	       (type (or (cdr (assq 'type cont))
-			 (and filename (mm-default-file-encoding filename))
-			 "application/octet-stream"))
+			 (if filename
+			     (or (mm-default-file-encoding filename)
+				 "application/octet-stream")
+			   "text/plain")))
 	       (charset (cdr (assq 'charset cont)))
 	       (coding (mm-charset-to-coding-system charset))
 	       encoding flowed coded)
@@ -544,8 +546,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	  (insert "\n\n")
 	  (insert "Content-Type: "
 		  (or (cdr (assq 'type cont))
-		      (and name (mm-default-file-encoding name))
-		      "application/octet-stream")
+		      (if name
+			  (or (mm-default-file-encoding name)
+			      "application/octet-stream")
+			"text/plain"))
 		  "\n")
 	  (insert "Content-ID: " (message-make-message-id) "\n")
 	  (insert "Content-Transfer-Encoding: "