Synch to No Gnus 200503230048.

[elisp/gnus.git-] / lisp / nnrss.el

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 211ca3e..832b9b5 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -151,16 +151,19 @@ ARTICLE is the article number of the current headline.")
   'nov)
 
 (deffoo nnrss-request-group (group &optional server dont-check)
+  (nnheader-message 6 (concat "nnrss: Requesting " group "..."))
   (setq group (nnrss-decode-group-name group))
   (nnrss-possibly-change-group group server)
-  (if dont-check
-      t
-    (nnrss-check-group group server)
-    (nnheader-report 'nnrss "Opened group %s" group)
-    (nnheader-insert
-     "211 %d %d %d %s\n" nnrss-group-max nnrss-group-min nnrss-group-max
-     (prin1-to-string group)
-     t)))
+  (prog1
+      (if dont-check
+         t
+       (nnrss-check-group group server)
+       (nnheader-report 'nnrss "Opened group %s" group)
+       (nnheader-insert
+        "211 %d %d %d %s\n" nnrss-group-max nnrss-group-min nnrss-group-max
+        (prin1-to-string group)
+        t))
+    (nnheader-message 6 (concat "nnrss: Requesting " group "...done"))))
 
 (deffoo nnrss-close-group (group &optional server)
   t)
@@ -687,7 +690,8 @@ Careful with this on large documents!"
            (when (car-safe bit)
              (when (equal tag (car bit))
                ;; Old xml.el may return a list of string.
-               (when (consp (caddr bit))
+               (when (and (consp (caddr bit))
+                          (stringp (caaddr bit)))
                  (setcar (cddr bit) (caaddr bit)))
                (setq found-list
                      (append found-list