* nnheader.el (nnheader-remove-body): Fix an error of detecting boundary

 between headers and body.
* nnml.el (nnml-parse-head): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 007b378..22186a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,18 @@
+2002-10-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+       * nnheader.el (nnheader-remove-body): Fix an error of detecting
+       boundary between headers and body.
+       * nnml.el (nnml-parse-head): Ditto.
+
 2002-10-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * nnslashdot.el (nnslashdot-generate-active): Ignore any bogus
-       entries. 
+       entries.
 
        * gnus-group.el (gnus-fetch-group): Allow an optional
        specification of the articles to select.
 
-       * gnus-srvr.el (gnus-server-prepare): Removed superfluous cdr. 
+       * gnus-srvr.el (gnus-server-prepare): Removed superfluous cdr.
 
 2002-10-20  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
@@ -38,7 +44,7 @@
 
 2002-10-18  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
-       * gnus-spec.el (gnus-make-format-preserve-properties) 
+       * gnus-spec.el (gnus-make-format-preserve-properties)
        (gnus-xmas-format, gnus-parse-simple-format): Preserve text
        properties also on XEmacs.  `gnus-xmas-format' is like format but
        preserves text properties on XEmacs (though it only understands
@@ -81,7 +87,7 @@
        (spam-display-buffer-contents): Remove.
        (spam-bogofilter-score): Merge spam-display-buffer-contents.
 
-2002-10-17  Ted Zlatanov <tzz@lifelogs.com>
+2002-10-17  Ted Zlatanov  <tzz@lifelogs.com>
 
        * spam.el (spam-display-buffer-contents): New function.
        (spam-bogofilter-score): use spam-display-buffer-contents, patch

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 85a69fc..84da0da 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -633,8 +633,7 @@ the line could be found."
 (defun nnheader-remove-body ()
   "Remove the body from an article in this current buffer."
   (goto-char (point-min))
-  (when (or (search-forward "\n\n" nil t)
-           (search-forward "\n\r\n" nil t))
+  (when (re-search-forward "\n\r?\n" nil t)
     (delete-region (point) (point-max))))
 
 (defun nnheader-set-temp-buffer (name &optional noerase)

diff --git a/lisp/nnml.el b/lisp/nnml.el
index cb64426..25b3913 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -701,11 +701,9 @@ marks file will be regenerated properly by Gnus.")
       (unless (zerop (buffer-size))
        (narrow-to-region
         (goto-char (point-min))
-        (if (search-forward "\n\n" nil t)
+        (if (re-search-forward "\n\r?\n" nil t)
             (1- (point))
-          (if (search-forward "\n\r\n" nil t)
-              (- (point) 2)
-            (point-max)))))
+          (point-max))))
       (let ((headers (nnheader-parse-naked-head)))
        (mail-header-set-chars headers chars)
        (mail-header-set-number headers number)