From df0b01919834fa8d3d44f51f3ed574b12aafd35c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 15 Dec 2004 06:30:32 +0000 Subject: [PATCH] Synch to No Gnus 200412150630. --- lisp/ChangeLog | 5 +++++ lisp/nnrss.el | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) 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 (tiny change) + + * nnrss.el (nnrss-fetch): Signal an error if w3-parse-buffer also + failed. + 2004-12-14 Katsumi Yamaoka * 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)))) -- 1.7.10.4