From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Tue, 5 Oct 2010 16:45:19 +0000 (+0200)
Subject: (nnir-retrieve-headers): Don't bug out on invalid data.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=8c795bd766424e4265711089feab72c813ec241b

(nnir-retrieve-headers): Don't bug out on invalid data.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df10a57be..d676b8383 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* nnir.el (nnir-retrieve-headers): Don't bug out on invalid data.
+
 	* gnus-group.el (gnus-group-make-group): Doc fix.
 
 	* nnimap.el (nnimap-request-newgroups): Return success.
diff --git a/lisp/nnir.el b/lisp/nnir.el
index 453cabbc4..7a5380c52 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -797,35 +797,25 @@ and show thread that contains this article."
 						   artfullgroup nil))
 	      (nov
 	       (goto-char (point-min))
-	       (setq novitem (nnheader-parse-nov))
-	       (unless novitem
-		 (pop-to-buffer nntp-server-buffer)
-		 (error
-		  "nnheader-parse-nov returned nil for article %s in group %s"
-		  artno artfullgroup)))
+	       (setq novitem (nnheader-parse-nov)))
 	      (headers
 	       (goto-char (point-min))
-	       (setq novitem (nnheader-parse-head))
-	       (unless novitem
-		 (pop-to-buffer nntp-server-buffer)
-		 (error
-		  "nnheader-parse-head returned nil for article %s in group %s"
-		  artno artfullgroup)))
+	       (setq novitem (nnheader-parse-head)))
 	      (t (error "Unknown header type %s while requesting article %s of group %s"
 			foo artno artfullgroup)))))
 	;; replace article number in original group with article number
         ;; in nnir group
-        (mail-header-set-number novitem art)
-        (mail-header-set-from novitem
-                              (mail-header-from novitem))
-        (mail-header-set-subject
-         novitem
-         (format "[%d: %s/%d] %s"
-                 artrsv artgroup artno
-                 (mail-header-subject novitem)))
-        ;;-(mail-header-set-extra novitem nil)
-        (push novitem novdata)
-        (setq artlist (cdr artlist)))
+	(when novitem
+	  (mail-header-set-number novitem art)
+	  (mail-header-set-from novitem
+				(mail-header-from novitem))
+	  (mail-header-set-subject
+	   novitem
+	   (format "[%d: %s/%d] %s"
+		   artrsv artgroup artno
+		   (mail-header-subject novitem)))
+	  (push novitem novdata)
+	  (setq artlist (cdr artlist))))
       (setq novdata (nreverse novdata))
       (set-buffer nntp-server-buffer) (erase-buffer)
       (mapc 'nnheader-insert-nov novdata)