From: yamaoka <yamaoka>
Date: Thu, 14 Sep 2000 13:31:00 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~97
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afb66c0b292ffd990df2ab4c94093aae3ec76764;p=elisp%2Fgnus.git-

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18177b6..e2daee9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-14 08:42:48  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nndoc.el (nndoc-dissect-mime-parts-sub): Remove
+	Content-Disposition.
+
 2000-09-13 23:58:40  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* webmail.el: Hotmail updated. Add X-Gnus-Webmail.
diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index b7ecab6..e59b22c 100644
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -783,7 +783,7 @@ PARENT is the message-ID of the parent summary line, or nil for none."
       (let ((part-counter 0)
 	    part-begin part-end eof-flag)
 	(while (string-match "\
-^\\(Lines\\|Content-\\(Type\\|Transfer-Encoding\\)\\):.*\n\\([ \t].*\n\\)*"
+^\\(Lines\\|Content-\\(Type\\|Transfer-Encoding\\|Disposition\\)\\):.*\n\\([ \t].*\n\\)*"
 			     article-insert)
 	  (setq article-insert (replace-match "" t t article-insert)))
 	(let ((case-fold-search nil))