2003-05-01 David Z. Maze <dmaze@mit.edu>

	* nnrss.el (nnrss-find-rss-via-syndic8): Have an `error' branch
	in condition-case.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cae98e..b677f04 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-01  David Z. Maze  <dmaze@mit.edu>
+
+       * nnrss.el (nnrss-find-rss-via-syndic8): Have an `error' branch
+       in condition-case.
+
 2003-05-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-required-headers): Remove In-Reply-To.

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 9d8c90c..ced221f 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -413,9 +413,11 @@ ARTICLE is the article number of the current headline.")
                    (second (assoc group nnrss-group-alist))))
       (unless url
        (setq url
-             (nnrss-discover-feed
-              (read-string
-               (format "URL to search for %s: " group) "http://")))
+             (cdr
+              (assoc 'href
+                     (nnrss-discover-feed
+                      (read-string
+                       (format "URL to search for %s: " group) "http://")))))
        (let ((pair (assoc group nnrss-server-data)))
          (if pair
              (setcdr (cdr pair) (list url))
@@ -707,7 +709,7 @@ whether they are `offsite' or `onsite'."
                                  "Multiple feeds found.  Select one: "
                                  selection nil t) urllist)))
                       (cdar urllist))))))
-    (message "XML-RPC is not available... not checking Syndic8.")))
+    (error (message "XML-RPC is not available... not checking Syndic8."))))
 
 (defun nnrss-rss-p (data)
   "Test if data is an RSS feed.  Simply ensures that the first