Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c32d25..a527e8a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-06 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-encode-message-body): Don't insert
+       Content-Type if it is inside a mail.
+
 2001-02-06 02:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-xmas.el (gnus-xmas-article-menu-add): Add

diff --git a/lisp/message.el b/lisp/message.el
index 20a1ba6..d5e4291 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5707,7 +5707,8 @@ regexp varstr."
        (when lines
          (insert lines))
        (setq content-type-p
-             (re-search-backward "^Content-Type:" nil t)))
+             (or mml-boundary
+                 (re-search-backward "^Content-Type:" nil t))))
       (save-restriction
        (message-narrow-to-headers-or-head)
        (message-remove-first-header "Content-Type")