Synch to No Gnus 200405031523.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 999a6ff..b54b27f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-03  Jesper Harder  <harder@ifa.au.dk>
+
+       * nnrss.el (nnrss-check-group, nnrss-read-group-data): Hash on
+       description rather than subject.
+
 2004-05-02  Steve Youngs  <steve@youngs.au.com>
 
        * dgnushack.el: Autoload `mail-fetch-field' for XEmacs. 

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 0662862..2e410e1 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -331,7 +331,7 @@ ARTICLE is the article number of the current headline.")
       (let ((coding-system-for-read 'binary))
        (load file nil t t))
       (dolist (e nnrss-group-data)
-       (puthash (or (nth 2 e) (nth 3 e)) t nnrss-group-hashtb)
+       (puthash (or (nth 2 e) (nth 5 e)) t nnrss-group-hashtb)
        (when (and (car e) (> nnrss-group-min (car e)))
          (setq nnrss-group-min (car e)))
        (when (and (car e) (< nnrss-group-max (car e)))
@@ -424,10 +424,12 @@ ARTICLE is the article number of the current headline.")
                 (if (setq url (nnrss-decode-entities-unibyte-string
                                (nnrss-node-text rss-ns 'link (cddr item))))
                     (not (gethash url nnrss-group-hashtb))
-                  (setq subject (nnrss-node-text rss-ns 'title item))
-                  (not (gethash subject nnrss-group-hashtb))))
-       (setq subject (or subject (nnrss-node-text rss-ns 'title item)))
-       (setq extra (or (nnrss-node-text content-ns 'encoded item)
+                  (setq extra (or (nnrss-node-text content-ns 'encoded item)
+                                  (nnrss-node-text rss-ns 'description item)))
+                  (not (gethash extra nnrss-group-hashtb))))
+       (setq subject (nnrss-node-text rss-ns 'title item))
+       (setq extra (or extra
+                       (nnrss-node-text content-ns 'encoded item)
                        (nnrss-node-text rss-ns 'description item)))
        (setq author (or (nnrss-node-text rss-ns 'author item)
                         (nnrss-node-text dc-ns 'creator item)
@@ -445,9 +447,9 @@ ARTICLE is the article number of the current headline.")
          date
          (and extra (nnrss-decode-entities-unibyte-string extra)))
         nnrss-group-data)
-       (puthash (or url subject) t nnrss-group-hashtb)
+       (puthash (or url extra) t nnrss-group-hashtb)
        (setq changed t))
-       (setq subject nil))
+       (setq extra nil))
     (when changed
       (nnrss-save-group-data group server)
       (let ((pair (assoc group nnrss-server-data)))