2006-02-24 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>

	* nnweb.el (nnweb-gmane-create-mapping): Don't choke on ^M.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5f0543e..6c8aab5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+       * nnweb.el (nnweb-gmane-create-mapping): Don't choke on ^M.
+
 2006-02-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-int.el (gnus-open-server): Respect gnus-batch-mode.

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 16c6d6b..8b78457 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -471,7 +471,7 @@ Valid types include `google', `dejanews', and `gmane'.")
        (forward-line 1)
        ;; Thanks to Olly Betts we now have NOV lines in our buffer!
        (while (not (eobp))
-         (unless (eolp)
+         (unless (or (eolp) (looking-at "\x0d"))
            (let ((header (nnheader-parse-nov)))
              (let ((xref (mail-header-xref header))
                    (from (mail-header-from header))