projects / elisp / gnus.git- / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SYnch to No Gnus 200404251801.
[elisp/gnus.git-] / lisp / nnrss.el
diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index de4a5a9..d2a8cf9 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -484,11 +484,11 @@ Export subscriptions to a buffer in OPML Format."
             "    <ownerName>" (user-full-name) "</ownerName>\n"
             "  </head>\n"
             "  <body>\n"))
-    (mapcar (lambda (sub)
-             (insert (concat
-                      "    <outline text=\"" (car sub) "\" xmlUrl=\""
-                      (cadr sub) "\"/>\n")))
-           nnrss-group-alist)
+    (mapc (lambda (sub)
+           (insert (concat
+                    "    <outline text=\"" (car sub) "\" xmlUrl=\""
+                    (cadr sub) "\"/>\n")))
+         nnrss-group-alist)
     (insert (concat
             "  </body>\n"
            "</opml>\n")))
@@ -565,24 +565,24 @@ It is useful when `(setq nnrss-use-local t)'."
 (defun nnrss-find-el (tag data &optional found-list)
   "Find the all matching elements in the data.
 Careful with this on large documents!"
-  (if (listp data)
-      (mapcar (lambda (bit)
-               (when (car-safe bit)
-                 (when (equal tag (car bit))
-                   (setq found-list
-                         (append found-list
-                                 (list bit))))
-                 (if (and (listp (car-safe (caddr bit)))
-                          (not (stringp (caddr bit))))
-                     (setq found-list
-                           (append found-list
-                                   (nnrss-find-el
-                                    tag (caddr bit))))
-                   (setq found-list
-                         (append found-list
-                                 (nnrss-find-el
-                                  tag (cddr bit)))))))
-             data))
+  (when (listp data)
+    (mapc (lambda (bit)
+           (when (car-safe bit)
+             (when (equal tag (car bit))
+               (setq found-list
+                     (append found-list
+                             (list bit))))
+             (if (and (listp (car-safe (caddr bit)))
+                      (not (stringp (caddr bit))))
+                 (setq found-list
+                       (append found-list
+                               (nnrss-find-el
+                                tag (caddr bit))))
+               (setq found-list
+                     (append found-list
+                             (nnrss-find-el
+                              tag (cddr bit)))))))
+         data))
   found-list)
 
 (defun nnrss-rsslink-p (el)
@@ -629,27 +629,27 @@ whether they are `offsite' or `onsite'."
        rss-onsite-in   rdf-onsite-in   xml-onsite-in
        rss-offsite-end rdf-offsite-end xml-offsite-end
        rss-offsite-in rdf-offsite-in xml-offsite-in)
-    (mapcar (lambda (href)
-             (if (not (null href))
-             (cond ((string-match "\\.rss$" href)
-                    (nnrss-match-macro
-                     base-uri href rss-onsite-end rss-offsite-end))
-                   ((string-match "\\.rdf$" href)
-                    (nnrss-match-macro
-                     base-uri href rdf-onsite-end rdf-offsite-end))
-                   ((string-match "\\.xml$" href)
-                    (nnrss-match-macro
-                     base-uri href xml-onsite-end xml-offsite-end))
-                   ((string-match "rss" href)
-                    (nnrss-match-macro
-                     base-uri href rss-onsite-in rss-offsite-in))
-                   ((string-match "rdf" href)
-                    (nnrss-match-macro
-                     base-uri href rdf-onsite-in rdf-offsite-in))
-                   ((string-match "xml" href)
-                    (nnrss-match-macro
-                     base-uri href xml-onsite-in xml-offsite-in)))))
-           hrefs)
+    (mapc (lambda (href)
+           (if (not (null href))
+               (cond ((string-match "\\.rss$" href)
+                      (nnrss-match-macro
+                       base-uri href rss-onsite-end rss-offsite-end))
+                     ((string-match "\\.rdf$" href)
+                      (nnrss-match-macro
+                       base-uri href rdf-onsite-end rdf-offsite-end))
+                     ((string-match "\\.xml$" href)
+                      (nnrss-match-macro
+                       base-uri href xml-onsite-end xml-offsite-end))
+                     ((string-match "rss" href)
+                      (nnrss-match-macro
+                       base-uri href rss-onsite-in rss-offsite-in))
+                     ((string-match "rdf" href)
+                      (nnrss-match-macro
+                       base-uri href rdf-onsite-in rdf-offsite-in))
+                     ((string-match "xml" href)
+                      (nnrss-match-macro
+                       base-uri href xml-onsite-in xml-offsite-in)))))
+         hrefs)
     (append
      rss-onsite-end  rdf-onsite-end  xml-onsite-end
      rss-onsite-in   rdf-onsite-in   xml-onsite-in