X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-dup.el;h=a2b5544b0dc1f3af01b68675e61ba14a827fa684;hb=fda79fc773c3018266173a6c4ea3776685845c1d;hp=da46608d48be93748e89e067ee24fc2830daad68;hpb=83d810b5c6197e8abbae3df32b869da831e0cd2c;p=gnus

diff --git a/lisp/gnus-dup.el b/lisp/gnus-dup.el
index da46608d4..a2b5544b0 100644
--- a/lisp/gnus-dup.el
+++ b/lisp/gnus-dup.el
@@ -1,7 +1,8 @@
 ;;; 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.
@@ -30,26 +31,39 @@
 
 ;;; Code:
 
-(require 'gnus-load)
-(require 'gnus-art)
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
+(require 'gnus-art)
 
-(defvar gnus-save-duplicate-list nil
+(defgroup gnus-duplicate nil
+  "Suppression of duplicate articles."
+  :group 'gnus)
+
+(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
 
 (defvar gnus-dup-list nil)
 (defvar gnus-dup-hashtb nil)
 
+(defvar gnus-dup-list-dirty nil)
+
 ;;;
 ;;; Starting and stopping
 ;;;
@@ -58,10 +72,10 @@ seen in the same session.")
 
 (defun gnus-dup-close ()
   "Possibly save the duplicate suppression list and shut down the subsystem."
-  (when gnus-save-duplicate-list
-    (gnus-dup-save))
+  (gnus-dup-save)
   (setq gnus-dup-list nil
-	gnus-dup-hashtb nil))
+	gnus-dup-hashtb nil
+	gnus-dup-list-dirty nil))
 
 (defun gnus-dup-open ()
   "Possibly read the duplicate suppression list and start the subsystem."
@@ -72,7 +86,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 ()
@@ -83,8 +97,11 @@ seen in the same session.")
 
 (defun gnus-dup-save ()
   "Save the duplicate suppression list."
-  (nnheader-temp-write gnus-duplicate-file
-    (gnus-prin1 `(setq gnus-duplicate-file ',gnus-duplicate-file))))
+  (when (and gnus-save-duplicate-list
+	     gnus-dup-list-dirty)
+    (with-temp-file gnus-duplicate-file
+      (gnus-prin1 `(setq gnus-dup-list ',gnus-dup-list))))
+  (setq gnus-dup-list-dirty nil))
 
 ;;;
 ;;; Interface functions
@@ -94,21 +111,25 @@ seen in the same session.")
   "Enter articles from the current group for future duplicate suppression."
   (unless gnus-dup-list
     (gnus-dup-open))
+  (setq gnus-dup-list-dirty t)		; mark list for saving
   (let ((data gnus-newsgroup-data)
-	id)
+	datum msgid)
     ;; Enter the Message-IDs of all read articles into the list
     ;; and hash table.
-    (while data
-      (when (and (not (gnus-data-pseudo-p data))
-		 (gnus-data-read-p (car data)))
-	(intern (car (push (mail-header-id (gnus-data-header (car data)))
-			   gnus-dup-list))
-		gnus-dup-hashtb))
-      (pop data))
-    ;; Chop off excess Message-IDs from the list.
-    (let ((end (nthcdr gnus-duplicate-list-length gnus-dup-list)))
-      (when end 
-	(setcdr end nil)))))
+    (while (setq datum (pop data))
+      (when (and (not (gnus-data-pseudo-p datum))
+		 (> (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
+      (setcdr end nil))))
 
 (defun gnus-dup-suppress-articles ()
   "Mark duplicate articles as read."
@@ -116,21 +137,26 @@ seen in the same session.")
     (gnus-dup-open))
   (gnus-message 6 "Suppressing duplicates...")
   (let ((headers gnus-newsgroup-headers)
-	number)
-    (while headers
-      (when (intern-soft (mail-header-id (car headers)) gnus-dup-hashtb)
-	(setq gnus-newsgroup-unreads 
-	      (delq (setq number (mail-header-number (car headers)))
+	(auto (and gnus-newsgroup-auto-expire
+		   (memq gnus-duplicate-mark gnus-auto-expirable-marks)))
+	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))
-      (pop headers)))
+	(if (not auto)
+	    (push (cons number gnus-duplicate-mark) gnus-newsgroup-reads)
+	  (push number gnus-newsgroup-expirable)
+	  (push (cons number gnus-expirable-mark) gnus-newsgroup-reads)))))
   (gnus-message 6 "Suppressing duplicates...done"))
 
 (defun gnus-dup-unsuppress-article (article)
   "Stop suppression of ARTICLE."
   (let ((id (mail-header-id (gnus-data-header (gnus-data-find article)))))
     (when id
+      (setq gnus-dup-list-dirty t)
       (setq gnus-dup-list (delete id gnus-dup-list))
       (unintern id gnus-dup-hashtb))))