X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnultimate.el;h=f32167e6fe202302194b04ba27a502d3903a6cfd;hb=3c6a96d019e0fcdf0d35f9d4873f62c1962995ad;hp=d30c1a8ae57cc00d7062df201c4ac7ef2fa95a54;hpb=027a90912122f2cb3e36d82310f32962e3ce2f71;p=elisp%2Fgnus.git-

diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el
index d30c1a8..f32167e 100644
--- a/lisp/nnultimate.el
+++ b/lisp/nnultimate.el
@@ -1,5 +1,5 @@
 ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
 
 (require 'nnoo)
 (require 'message)
@@ -82,7 +83,8 @@
       (while (and (setq article (car articles))
 		  map)
 	(while (and map
-		    (> article (caar map)))
+		    (or (> article (caar map))
+			(< (cadar map) (caar map))))
 	  (pop map))
 	(when (setq mmap (car map))
 	  (setq farticle -1)
@@ -124,7 +126,8 @@
 				      "-" (number-to-string current-page)
 				      (match-string 0 href))))
 	      (goto-char (point-min))
-	      (setq contents (w3-parse-buffer (current-buffer)))
+	      (setq contents
+		    (ignore-errors (w3-parse-buffer (current-buffer))))
 	      (setq table (nnultimate-find-forum-table contents))
 	      (setq string (mapconcat 'identity (nnweb-text table) ""))
 	      (when (string-match "topic is \\([0-9]\\) pages" string)
@@ -337,25 +340,26 @@
 		(setq art (1+ (string-to-number (car artlist)))))
 	      (pop artlist))
 	    (setq garticles art))
-	  (string-match "/\\([0-9]+\\).html" href)
-	  (setq topic (string-to-number (match-string 1 href)))
-	  (if (setq tinfo (assq topic topics))
-	      (progn
-		(setq old-max (cadr tinfo))
-		(setcar (cdr tinfo) garticles))
-	    (setq old-max 0)
-	    (push (list topic garticles subject href) topics)
-	    (setcar (nthcdr 4 entry) topics))
-	  (when (not (= old-max garticles))
-	    (setq inc (- garticles old-max))
-	    (setq mapping (nconc mapping
-				 (list
-				  (list
-				   old-total (1- (incf old-total inc))
-				   topic (1+ old-max)))))
-	    (incf old-max inc)
-	    (setcar (nthcdr 5 entry) mapping)
-	    (setcar (nthcdr 6 entry) old-total)))))
+	  (when garticles
+	    (string-match "/\\([0-9]+\\).html" href)
+	    (setq topic (string-to-number (match-string 1 href)))
+	    (if (setq tinfo (assq topic topics))
+		(progn
+		  (setq old-max (cadr tinfo))
+		  (setcar (cdr tinfo) garticles))
+	      (setq old-max 0)
+	      (push (list topic garticles subject href) topics)
+	      (setcar (nthcdr 4 entry) topics))
+	    (when (not (= old-max garticles))
+	      (setq inc (- garticles old-max))
+	      (setq mapping (nconc mapping
+				   (list
+				    (list
+				     old-total (1- (incf old-total inc))
+				     topic (1+ old-max)))))
+	      (incf old-max inc)
+	      (setcar (nthcdr 5 entry) mapping)
+	      (setcar (nthcdr 6 entry) old-total))))))
     (setcar (nthcdr 7 entry) current-time)
     (setcar (nthcdr 1 entry) (1- old-total))
     (nnultimate-write-groups)