(nnheader-insert-head): Make it work with Mac as well.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1e6477..b593047 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnheader.el (nnheader-insert-head): Make it work with Mac as well.
+
 2006-07-28  Daiki Ueno  <ueno@unixuser.org>
 
        * mml2015.el (mml2015-epg-sign): If mml2015-signers is not set, use the

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 31601c8..d3cb179 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -609,12 +609,12 @@ the line could be found."
                        (nth 1 (mm-insert-file-contents
                                file nil beg
                                (incf beg nnheader-head-chop-length))))
-                   ;; CRLF might be used for the line-break code.
-                   (prog1 (not (re-search-forward "\n\r?\n" nil t))
+                   ;; CRLF of CR might be used for the line-break code.
+                   (prog1 (not (re-search-forward "\n\r?\n\\|\r\r" nil t))
                      (goto-char (point-max)))
                    (or (null nnheader-max-head-length)
                        (< beg nnheader-max-head-length))))
-       ;; Finally decode contents.
+       ;; Finally decode the contents.
        (when (mm-coding-system-p nnheader-file-coding-system)
          (mm-decode-coding-region start (point-max)
                                   nnheader-file-coding-system))))