*** empty log message ***

[gnus] / lisp / gnus-dup.el

diff --git a/lisp/gnus-dup.el b/lisp/gnus-dup.el
index 2bbde1d..6958f02 100644 (file)
--- a/lisp/gnus-dup.el
+++ b/lisp/gnus-dup.el
@@ -1,7 +1,7 @@
 ;;; gnus-dup.el --- suppression of duplicate articles in Gnus
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 (require 'gnus-art)
 
@@ -83,7 +85,7 @@ seen in the same session."
   ;; Enter all Message-IDs into the hash table.
   (let ((list gnus-dup-list)
        (obarray gnus-dup-hashtb))
-    (while list 
+    (while list
       (intern (pop list)))))
 
 (defun gnus-dup-read ()
@@ -116,7 +118,8 @@ seen in the same session."
     (while (setq datum (pop data))
       (when (and (not (gnus-data-pseudo-p datum))
                 (> (gnus-data-number datum) 0)
-                (gnus-data-read-p datum)
+                (not (memq (gnus-data-number datum) gnus-newsgroup-unreads))
+                (not (= (gnus-data-mark datum) gnus-canceled-mark))
                 (setq msgid (mail-header-id (gnus-data-header datum)))
                 (not (nnheader-fake-message-id-p msgid))
                 (not (intern-soft msgid gnus-dup-hashtb)))
@@ -124,7 +127,7 @@ seen in the same session."
        (intern msgid gnus-dup-hashtb))))
   ;; Chop off excess Message-IDs from the list.
   (let ((end (nthcdr gnus-duplicate-list-length gnus-dup-list)))
-    (when end 
+    (when end
       (setcdr end nil))))
 
 (defun gnus-dup-suppress-articles ()
@@ -132,14 +135,14 @@ seen in the same session."
   (unless gnus-dup-list
     (gnus-dup-open))
   (gnus-message 6 "Suppressing duplicates...")
-  (let ((data gnus-newsgroup-data)
-       number d)
-    (while (setq d (pop data))
-      (when (and (intern-soft (mail-header-id (gnus-data-header d))
-                             gnus-dup-hashtb)
-                (gnus-data-unread-p d))
-       (setq gnus-newsgroup-unreads 
-             (delq (setq number (gnus-data-number d)) gnus-newsgroup-unreads))
+  (let ((headers gnus-newsgroup-headers)
+       number header)
+    (while (setq header (pop headers))
+      (when (and (intern-soft (mail-header-id header) gnus-dup-hashtb)
+                (gnus-summary-article-unread-p (mail-header-number header)))
+       (setq gnus-newsgroup-unreads
+             (delq (setq number (mail-header-number header))
+                   gnus-newsgroup-unreads))
        (push (cons number gnus-duplicate-mark)
              gnus-newsgroup-reads))))
   (gnus-message 6 "Suppressing duplicates...done"))