;;; gnus-dup.el --- suppression of duplicate articles in Gnus
-;; Copyright (C) 1996 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;; 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.
;;; Code:
-(require 'gnus-load)
-(require 'gnus-art)
+(eval-when-compile (require 'cl))
+
(require 'gnus)
+(require 'gnus-art)
+
+(defgroup gnus-duplicate nil
+ "Suppression of duplicate articles."
+ :group 'gnus)
-(defvar gnus-save-duplicate-list nil
+(defcustom gnus-save-duplicate-list nil
"*If non-nil, save the duplicate list when shutting down Gnus.
If nil, duplicate suppression will only work on duplicates
-seen in the same session.")
+seen in the same session."
+ :group 'gnus-duplicate
+ :type 'boolean)
-(defvar gnus-duplicate-list-length 10000
- "*The number of Message-IDs to keep in the duplicate suppression list.")
+(defcustom gnus-duplicate-list-length 10000
+ "*The number of Message-IDs to keep in the duplicate suppression list."
+ :group 'gnus-duplicate
+ :type 'integer)
-(defvar gnus-duplicate-file (nnheader-concat gnus-directory "suppression")
- "*The name of the file to store the duplicate suppression list.")
+(defcustom gnus-duplicate-file (nnheader-concat gnus-directory "suppression")
+ "*The name of the file to store the duplicate suppression list."
+ :group 'gnus-duplicate
+ :type 'file)
;;; Internal variables
;; 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 ()
"Save the duplicate suppression list."
(when (and gnus-save-duplicate-list
gnus-dup-list-dirty)
- (nnheader-temp-write gnus-duplicate-file
+ (with-temp-file gnus-duplicate-file
(gnus-prin1 `(setq gnus-dup-list ',gnus-dup-list))))
(setq gnus-dup-list-dirty nil))
(gnus-dup-open))
(setq gnus-dup-list-dirty t) ; mark list for saving
(let ((data gnus-newsgroup-data)
- datum)
+ datum msgid)
;; Enter the Message-IDs of all read articles into the list
;; and hash table.
(while (setq datum (pop data))
(when (and (not (gnus-data-pseudo-p datum))
- (gnus-data-read-p datum)
- (not (intern-soft (mail-header-id (gnus-data-header datum))
- gnus-dup-hashtb)))
- (intern (car (push (mail-header-id (gnus-data-header datum))
- gnus-dup-list))
- gnus-dup-hashtb))))
+ (> (gnus-data-number datum) 0)
+ (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)))
+ (push msgid gnus-dup-list)
+ (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 ()
(let ((headers gnus-newsgroup-headers)
number header)
(while (setq header (pop headers))
- (when (intern-soft (mail-header-id header) gnus-dup-hashtb)
- (setq gnus-newsgroup-unreads
+ (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)