From: yamaoka <yamaoka>
Date: Sun, 1 Jan 2006 06:46:24 +0000 (+0000)
Subject: Synch to No Gnus 200601010645.
X-Git-Tag: t-gnus-6_17_4-quimby-~159
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=547d49dd6b1f35f5bc8b6c3d53a13b67c6b10988;p=elisp%2Fgnus.git-

Synch to No Gnus 200601010645.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29715e9..f0f48d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-sum.el (gnus-summary-work-articles): Remove useless `min'.
+
+	* nnrss.el (nnrss-fetch): Make it fail gracefully when it can't
+	fetch a feed.  Suggested by Mark Plaksin <happy@mcplaksin.org>.
+	(nnrss-insert-w3): Ditto.
+
 2005-12-22  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-uu.el (gnus-uu-digest-mail-forward): Reverse the order of
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index a43b5fb..e804b27 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -387,7 +387,11 @@ otherwise return nil."
 	      ;; mm-url will load mm-util.  d-e-m-c should be bound to
 	      ;; t then, because of `mm-emacs-mule'.
 	      (default-enable-multibyte-characters t))
-	  (mm-url-insert url)))
+	  (condition-case err
+	      (mm-url-insert url)
+	    (error (if (or debug-on-quit debug-on-error)
+		       (signal (car err) (cdr err))
+		     (message "nnrss: Failed to fetch %s" url))))))
       (nnheader-remove-cr-followed-by-lf)
       ;; Decode text according to the encoding attribute.
       (when (setq cs (nnrss-get-encoding))
@@ -523,7 +527,11 @@ nnrss: %s: Not valid XML %s and w3-parse doesn't work %s"
 
 (defun nnrss-insert-w3 (url)
   (mm-with-unibyte-current-buffer
-    (mm-url-insert url)))
+    (condition-case err
+	(mm-url-insert url)
+      (error (if (or debug-on-quit debug-on-error)
+		 (signal (car err) (cdr err))
+	       (message "nnrss: Failed to fetch %s" url))))))
 
 (defun nnrss-decode-entities-string (string)
   (if string