From: yamaoka <yamaoka>
Date: Wed, 15 Dec 2004 06:30:32 +0000 (+0000)
Subject: Synch to No Gnus 200412150630.
X-Git-Tag: t-gnus-6_17_4-quimby-~634
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=df0b01919834fa8d3d44f51f3ed574b12aafd35c;p=elisp%2Fgnus.git-

Synch to No Gnus 200412150630.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed4e56e..b1f275f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-15  Maciek Pasternacki  <maciekp@japhy.fnord.org>  (tiny change)
+
+	* nnrss.el (nnrss-fetch): Signal an error if w3-parse-buffer also
+	failed.
+
 2004-12-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-group.el (gnus-group-delete-group): Decode group name.
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index c49a997..43bfcf0 100644
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -274,13 +274,15 @@ ARTICLE is the article number of the current headline.")
       ;; why w3-parse-buffer fails to parse some well-formed xml and
       ;; fix it.
 
-      (condition-case err
+      (condition-case nil
 	  (setq xmlform (xml-parse-region (point-min) (point-max)))
-	(error (if (fboundp 'w3-parse-buffer)
-		   (setq htmlform (caddar (w3-parse-buffer
-					   (current-buffer))))
-		 (message "nnrss: Not valid XML and w3 parse not available (%s)"
-			  url))))
+	(error
+	 (condition-case err
+	     (setq htmlform (caddar (w3-parse-buffer
+				     (current-buffer))))
+	   (error
+	    (message "nnrss: %s: Not valid XML and w3-parse doesn't work: %s"
+		     url err)))))
       (if htmlform
 	  htmlform
 	xmlform))))