* gnus-agent.el (gnus-agent-regenerate-group): New function.

[gnus] / lisp / nnrss.el

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index fb10c5e..1ffff53 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -27,6 +27,7 @@
 
 (eval-when-compile (require 'cl))
 
+(require 'gnus)
 (require 'nnoo)
 (require 'nnmail)
 (require 'message)
@@ -34,18 +35,12 @@
 (require 'gnus-util)
 (require 'time-date)
 (require 'rfc2231)
+(require 'mm-url)
 (eval-when-compile
   (ignore-errors
-    (require 'xml)
-    (require 'w3)
-    (require 'w3-forms)
-    (require 'nnweb)))
+    (require 'xml)))
 ;; Report failure to find w3 at load time if appropriate.
-(eval '(progn
-        (require 'xml)
-        (require 'w3)
-        (require 'w3-forms)
-        (require 'nnweb)))
+(eval '(require 'xml))
 
 (nnoo-declare nnrss)
 
@@ -204,8 +199,8 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                    (format "<%d@%s.nnrss>" (car e) group)
                    "\t" ;; id
                    "\t" ;; refs
-                   "0" "\t" ;; chars
-                   "0" "\t" ;; lines
+                   "-1" "\t" ;; chars
+                   "-1" "\t" ;; lines
                    "" "\t" ;; Xref
                    (if (and (nth 6 e)
                             (memq nnrss-description-field
@@ -262,7 +257,12 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
          (insert "\n")
          (if (nth 6 e)
              (let ((point (point)))
-               (insert (nnrss-string-as-multibyte (nth 6 e)) "\n\n")
+               (insert (nnrss-string-as-multibyte (nth 6 e)))
+               (goto-char point)
+               (while (search-forward "\n" nil t)
+                 (delete-char -1))
+               (goto-char (point-max))
+               (insert "\n\n")
                (fill-region point (point))))
          (if (nth 2 e)
              (insert (nth 2 e) "\n")))))
@@ -442,23 +442,14 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
 (defun nnrss-no-cache (url)
   "")
 
-;; TODO:: disable cache.
-;;
-;; (defun nnrss-insert-w3 (url)
-;;   (require 'url)
-;;   (require 'url-cache)
-;;   (let ((url-cache-creation-function 'nnrss-no-cache))
-;;     (mm-with-unibyte-current-buffer
-;;       (nnweb-insert url))))
-
 (defun nnrss-insert-w3 (url)
   (mm-with-unibyte-current-buffer
-    (nnweb-insert url)))
+    (mm-url-insert url)))
 
 (defun nnrss-decode-entities-unibyte-string (string)
   (mm-with-unibyte-buffer
     (insert string)
-    (nnweb-decode-entities)
+    (mm-url-decode-entities-nbsp)
     (buffer-substring (point-min) (point-max))))
 
 (defalias 'nnrss-insert 'nnrss-insert-w3)
@@ -470,8 +461,7 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
 ;;; Snarf functions
 
 (defun nnrss-check-group (group server)
-  (let ((w3-html-entities (cons '(nbsp . 32) w3-html-entities))
-       file xml subject url extra changed author date)
+  (let (file xml subject url extra changed author date)
     (condition-case err
        (mm-with-unibyte-buffer
          (if (and nnrss-use-local
@@ -501,8 +491,9 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
       (error
        (nnheader-message 1 "Error in group %s: %s" group (cadr err))))
     (while (and xml (not (assq 'item xml)))
-      (unless (listp (car (setq xml (cddar xml))))
-       (setq xml nil)))
+      (setq xml (cddar xml))
+      (while (not (listp (car xml)))
+       (setq xml (cdr xml))))
     (dolist (item (nreverse xml))
       (when (and (listp item)
                 (eq 'item (car item))
@@ -570,7 +561,7 @@ It is useful when `(setq nnrss-use-local t)'."
        (if (match-string 1)
            (setq category (match-string 1))
          (setq url (match-string 2)
-               name (nnweb-decode-entities-string
+               name (mm-url-decode-entities-string
                      (rfc2231-decode-encoded-string
                       (match-string 3))))
          (if category
@@ -582,7 +573,7 @@ It is useful when `(setq nnrss-use-local t)'."
        (nnrss-save-server-data ""))))
 
 (defun nnrss-format-string (string)
-  (nnweb-replace-in-string (nnrss-string-as-multibyte string) " *\n *" " "))
+  (gnus-replace-in-string (nnrss-string-as-multibyte string) " *\n *" " "))
 
 (defun nnrss-node-text (node)
   (if (and node (listp node))