diff lisp/gnus/nnir.el @ 110777:895607aec71e

Merge changes made in Gnus trunk. mm-decode.el (mm-shr): Bind shr-blocked-images to gnus-blocked-images. shr.el (shr-tag-table): Put all the images after the table. shr.el (shr-tag-table): Really inhibit images inside the table. shr.el (shr-collect-overlays): Copy over overlays from the TD elements to the main document. nnimap.el (nnimap-request-newgroups): Return success. gnus-group.el (gnus-group-make-group): Doc fix. nnir.el (nnir-retrieve-headers): Don't bug out on invalid data. gnus-sum.el (gnus-article-sort-by-most-recent-date): New function, added for symmetry. mm-decode.el (mm-shr): Allow displaying cid: images from shr.el. shr.el (shr-insert-table): Bind free variable. gnus-art.el (gnus-blocked-images): Move variable here. mm-decode.el (mm-shr): Require shr. shr.el (shr-tag-img): Shorten ALT texts and allow them to be line-broken. shr.el (shr-tag-img): Ignore image fetching errors. shr.el (shr-overlays-in-region): Compute overlay positions correctly. gnus-html.el (gnus-html-schedule-image-fetching): Protect against invalid URLs.

--- a/lisp/gnus/nnir.el	Tue Oct 05 16:20:24 2010 +0200
+++ b/lisp/gnus/nnir.el	Tue Oct 05 22:43:06 2010 +0000
@@ -792,40 +792,30 @@
 	  (if nnir-get-article-nov-override-function
 	      (setq novitem (funcall nnir-get-article-nov-override-function
 				     artitem))
-	  ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head
+	    ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head
 	    (case (setq foo (gnus-retrieve-headers (list artno)
 						   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)