From: yamaoka <yamaoka>
Date: Mon, 13 Mar 2006 09:32:47 +0000 (+0000)
Subject: Synch to No Gnus 200603130932.
X-Git-Tag: t-gnus-6_17_4-quimby-~44
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f3048abfaa9c4076820d938077044e04c9b0ec91;p=elisp%2Fgnus.git-

Synch to No Gnus 200603130932.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90968a5..c948f35 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-uu.el (mm-uu-dissect): Dissect all parts correctly.
+
+	* gnus-art.el (gnus-mime-display-single): Make sure there is an
+	empty line between a part and a message part.
+
 2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* smiley.el: Add more test smileys.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index a8fd3a1..455fa07 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5474,6 +5474,13 @@ If displaying \"text/html\" is discouraged \(see
 	(let ((id (1+ (length gnus-article-mime-handle-alist)))
 	      beg)
 	  (push (cons id handle) gnus-article-mime-handle-alist)
+	  (when (and display
+		     (equal (mm-handle-media-supertype handle) "message"))
+	    (insert-char
+	     ?\n
+	     (cond ((not (bolp)) 2)
+		   ((or (bobp) (eq (char-before (1- (point))) ?\n)) 0)
+		   (t 1))))
 	  (when (or (not display)
 		    (not (gnus-unbuttonized-mime-type-p type)))
 	    (gnus-insert-mime-button
diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 54d9211..3299cf3 100644
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -573,7 +573,8 @@ value of `mm-uu-text-plain-type'."
        (t (goto-char (point-max))))
       (setq text-start (point))
       (while (re-search-forward mm-uu-beginning-regexp nil t)
-	(setq start-point (match-beginning 0))
+	(setq start-point (match-beginning 0)
+	      entry nil)
 	(let ((alist mm-uu-type-alist)
 	      (beginning-regexp (match-string 0)))
 	  (while (not entry)