Index: nnir.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/contrib/nnir.el,v
retrieving revision 7.12
diff -c -r7.12 nnir.el
*** nnir.el	29 May 2006 22:13:00 -0000	7.12
--- nnir.el	31 May 2006 19:05:37 -0000
***************
*** 801,811 ****
  	  server)
        (while (not (null artlist))
          (setq art (car artlist))
-         (or (numberp art)
-             (nnheader-report
-              'nnir
-              "nnir-retrieve-headers doesn't grok message ids: %s"
-              art))
          (setq artitem (nnir-artlist-article nnir-artlist art))
          (setq artrsv (nnir-artitem-rsv artitem))
          (setq artfullgroup (nnir-artitem-group artitem))
--- 801,806 ----
***************
*** 854,875 ****
  
  (deffoo nnir-request-article (article
                                &optional group server to-buffer)
!   (save-excursion
!     (let* ((artitem (nnir-artlist-article nnir-artlist
!                                           article))
!            (artfullgroup (nnir-artitem-group artitem))
!            (artno (nnir-artitem-number artitem))
!            ;; Bug?
!            ;; Why must we bind nntp-server-buffer here?  It won't
!            ;; work if `buf' is used, say.  (Of course, the set-buffer
!            ;; line below must then be updated, too.)
!            (nntp-server-buffer (or to-buffer nntp-server-buffer)))
!       (set-buffer nntp-server-buffer)
!       (erase-buffer)
!       (message "Requesting article %d from group %s"
!                artno artfullgroup)
!       (gnus-request-article artno artfullgroup nntp-server-buffer)
!       (cons artfullgroup artno))))
  
  
  (nnoo-define-skeleton nnir)
--- 849,875 ----
  
  (deffoo nnir-request-article (article
                                &optional group server to-buffer)
!   (if (stringp article)
!       (nnheader-report
!        'nnir
!        "nnir-retrieve-headers doesn't grok message ids: %s"
!        article)
!     (save-excursion
!       (let* ((artitem (nnir-artlist-article nnir-artlist
! 					    article))
! 	     (artfullgroup (nnir-artitem-group artitem))
! 	     (artno (nnir-artitem-number artitem))
! 	     ;; Bug?
! 	     ;; Why must we bind nntp-server-buffer here?  It won't
! 	     ;; work if `buf' is used, say.  (Of course, the set-buffer
! 	     ;; line below must then be updated, too.)
! 	     (nntp-server-buffer (or to-buffer nntp-server-buffer)))
! 	(set-buffer nntp-server-buffer)
! 	(erase-buffer)
! 	(message "Requesting article %d from group %s"
! 		 artno artfullgroup)
! 	(gnus-request-article artno artfullgroup nntp-server-buffer)
! 	(cons artfullgroup artno)))))
  
  
  (nnoo-define-skeleton nnir)