X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-dup.el;h=eaecc07d7675f1ac63e80600117dda97dbe4a7c6;hb=cc52ad34d2922b013fd8026d0728617261979da6;hp=eb1a1ef86f637d2573bf7d46c5d8f5a9f70d1823;hpb=2fe24995a168a3573407e9d978d44aca7a177e7d;p=gnus

diff --git a/lisp/gnus-dup.el b/lisp/gnus-dup.el
index eb1a1ef86..eaecc07d7 100644
--- a/lisp/gnus-dup.el
+++ b/lisp/gnus-dup.el
@@ -1,25 +1,24 @@
 ;;; gnus-dup.el --- suppression of duplicate articles in Gnus
-;; Copyright (C) 1996 Free Software Foundation, Inc.
 
-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1996-2011 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -30,9 +29,10 @@
 
 ;;; 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."
@@ -82,10 +82,8 @@ seen in the same session."
     (setq gnus-dup-list nil))
   (setq gnus-dup-hashtb (gnus-make-hashtable gnus-duplicate-list-length))
   ;; Enter all Message-IDs into the hash table.
-  (let ((list gnus-dup-list)
-	(obarray gnus-dup-hashtb))
-    (while list 
-      (intern (pop list)))))
+  (let ((obarray gnus-dup-hashtb))
+    (mapc 'intern gnus-dup-list)))
 
 (defun gnus-dup-read ()
   "Read the duplicate suppression list."
@@ -97,7 +95,7 @@ seen in the same session."
   "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))
 
@@ -110,21 +108,23 @@ seen in the same session."
   (unless gnus-dup-list
     (gnus-dup-open))
   (setq gnus-dup-list-dirty t)		; mark list for saving
-  (let ((data gnus-newsgroup-data)
-	datum)
+  (let (msgid)
     ;; Enter the Message-IDs of all read articles into the list
     ;; and hash table.
-    (while (setq datum (pop data))
+    (dolist (datum gnus-newsgroup-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
+      (mapc (lambda (id) (unintern id gnus-dup-hashtb)) (cdr end))
       (setcdr end nil))))
 
 (defun gnus-dup-suppress-articles ()
@@ -132,20 +132,25 @@ seen in the same session."
   (unless gnus-dup-list
     (gnus-dup-open))
   (gnus-message 6 "Suppressing duplicates...")
-  (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 
+  (let ((auto (and gnus-newsgroup-auto-expire
+		   (memq gnus-duplicate-mark gnus-auto-expirable-marks)))
+	number)
+    (dolist (header gnus-newsgroup-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))))
+	(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)))))
+  (let* ((header (gnus-data-header (gnus-data-find article)))
+	 (id     (when header (mail-header-id header))))
     (when id
       (setq gnus-dup-list-dirty t)
       (setq gnus-dup-list (delete id gnus-dup-list))