Synch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8aace9b..99af294 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-06 14:17:48  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-decode.el (mm-dissect-multipart): Match the EOL of boundary.
+
 2000-07-05 21:19:22  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nnheader.el (nnheader-insert-nov): Remove EOLs of all fields.

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index ef28aa1..0ea60e1 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -295,7 +295,8 @@ to:
                (if (re-search-backward close-delimiter nil t)
                    (match-beginning 0)
                  (point-max)))))
-    (while (search-forward boundary end t)
+    (setq boundary (concat (regexp-quote boundary) "[ \t]*$"))
+    (while (re-search-forward boundary end t)
       (goto-char (match-beginning 0))
       (when start
        (save-excursion