(rfc2231-parse-string): Decode encoded value after concatenating segments

[gnus] / lisp / nnweb.el

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 16c6d6b..37cf7a3 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -415,7 +415,7 @@ Valid types include `google', `dejanews', and `gmane'.")
            (goto-char (point-min))
            (incf i 100)
            (if (or (not (re-search-forward
-                         "<a href=\"\n\\([^>\"]+\\)\"><img src=\"[^\"]+next"
+                         "<a href=\"\n\\([^>\" \n\t]+\\)[^<]*<img src=[^>]+next"
                          nil t))
                    (>= i nnweb-max-hits))
                (setq more nil)
@@ -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))