X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-sum.el;h=280138a12756ac8f83d6ed8008e53642a6279edc;hb=3699e65ce9be0c9372c6cd490164d69fab3dd2e7;hp=0a20c925031c69a0e512d920349130273b408416;hpb=85ffbeb4c72731bdd9324f57d2711d30d1c973e0;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 0a20c92..280138a 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1435,6 +1435,7 @@ increase the score of each group you read."
     "c" gnus-summary-copy-article
     "B" gnus-summary-crosspost-article
     "q" gnus-summary-respool-query
+    "t" gnus-summary-respool-trace
     "i" gnus-summary-import-article
     "p" gnus-summary-article-posted-p)
 
@@ -1556,6 +1557,7 @@ increase the score of each group you read."
                (gnus-check-backend-function
                 'request-expire-articles gnus-newsgroup-name)]
               ["Query respool" gnus-summary-respool-query t]
+	      ["Trace respool" gnus-summary-respool-trace t]
               ["Delete expirable articles" gnus-summary-expire-articles-now
                (gnus-check-backend-function
                 'request-expire-articles gnus-newsgroup-name)])
@@ -2948,6 +2950,7 @@ Returns HEADER if it was entered in the DEPENDENCIES.  Returns nil otherwise."
 
 (defun gnus-build-sparse-threads ()
   (let ((headers gnus-newsgroup-headers)
+	(gnus-summary-ignore-duplicates t)
 	header references generation relations
 	cthread subject child end pthread relation new-child date)
     ;; First we create an alist of generations/relations, where
@@ -2966,12 +2969,14 @@ Returns HEADER if it was entered in the DEPENDENCIES.  Returns nil otherwise."
 		generation 0)
 	  (while (search-backward ">" nil t)
 	    (setq end (1+ (point)))
-	    (if (search-backward "<" nil t)
-		(push (list (incf generation)
-			    child (setq child new-child)
-			    subject date)
-		      relations)))
-	  (push (list (1+ generation) child nil subject) relations)
+	    (when (search-backward "<" nil t)
+	      (setq new-child (buffer-substring (point) end))
+	      (push (list (incf generation)
+			  child (setq child new-child)
+			  subject date)
+		    relations)))
+	  (when child
+	    (push (list (1+ generation) child nil subject) relations))
 	  (erase-buffer)))
       (kill-buffer (current-buffer)))
     ;; Sort over trustworthiness.
@@ -2980,7 +2985,7 @@ Returns HEADER if it was entered in the DEPENDENCIES.  Returns nil otherwise."
        (when (gnus-dependencies-add-header
 	      (make-full-mail-header
 	       gnus-reffed-article-number
-	       (nth 3 relation) "" (nth 4 relation)
+	       (nth 3 relation) "" (or (nth 4 relation) "")
 	       (nth 1 relation)
 	       (or (nth 2 relation) "") 0 0 "")
 	      gnus-newsgroup-dependencies nil)
@@ -4659,6 +4664,19 @@ current article will be taken into consideration."
       ;; Just return the current article.
       (list (gnus-summary-article-number))))))
 
+(defmacro gnus-summary-iterate (arg &rest forms)
+  "Iterate over the process/prefixed articles and do FORMS.
+ARG is the interactive prefix given to the command.  FORMS will be
+executed with point over the summary line of the articles."
+  (let ((articles (make-symbol "gnus-summary-iterate-articles")))
+    `(let ((,articles (gnus-summary-work-articles ,arg)))
+       (while ,articles
+	 (gnus-summary-goto-subject (car ,articles))
+	 ,@forms))))
+
+(put 'gnus-summary-iterate 'lisp-indent-function 1)
+(put 'gnus-summary-iterate 'edebug-form-spec '(form body))
+
 (defun gnus-summary-save-process-mark ()
   "Push the current set of process marked articles on the stack."
   (interactive)
@@ -6059,7 +6077,8 @@ If ALL, mark even excluded ticked and dormants as read."
 		    '<)
 		   (sort gnus-newsgroup-limit '<)))
 	article)
-    (setq gnus-newsgroup-unreads gnus-newsgroup-limit)
+    (setq gnus-newsgroup-unreads
+	  (gnus-intersection gnus-newsgroup-unreads gnus-newsgroup-limit))
     (if all
 	(setq gnus-newsgroup-dormant nil
 	      gnus-newsgroup-marked nil
@@ -7368,7 +7387,7 @@ groups."
 
 ;;; Respooling
 
-(defun gnus-summary-respool-query (&optional silent)
+(defun gnus-summary-respool-query (&optional silent trace)
   "Query where the respool algorithm would put this article."
   (interactive)
   (let (gnus-mark-article-hook)
@@ -7377,7 +7396,7 @@ groups."
       (set-buffer gnus-original-article-buffer)
       (save-restriction
 	(message-narrow-to-head)
-	(let ((groups (nnmail-article-group 'identity)))
+	(let ((groups (nnmail-article-group 'identity trace)))
 	  (unless silent
 	    (if groups
 		(message "This message would go to %s"
@@ -7385,6 +7404,12 @@ groups."
 	      (message "This message would go to no groups"))
 	    groups))))))
 
+(defun gnus-summary-respool-trace ()
+  "Trace where the respool algorithm would put this article.
+Display a buffer showing all fancy splitting patterns which matched."
+  (interactive)
+  (gnus-summary-respool-query nil t))
+
 ;; Summary marking commands.
 
 (defun gnus-summary-kill-same-subject-and-select (&optional unmark)