[gnus git] branch master updated: n0-15-69-g94bdeec =1= Parent split by subject first, then sender.

       via  94bdeec908274fa46f3b297879bf6c3bfdc2e206 (commit)
      from  0b5b7d1494eab46f7a6c14dbda12f914ed9856e3 (commit)


- Log -----------------------------------------------------------------
commit 94bdeec908274fa46f3b297879bf6c3bfdc2e206
Author: Ted Zlatanov <[email protected]>
Date:   Fri Apr 15 07:48:20 2011 -0500

    Parent split by subject first, then sender.
    
    * gnus-registry.el (gnus-registry--split-fancy-with-parent-internal):
    Track by subject first, then sender.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f5c0c6..a8628ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-15  Teodor Zlatanov  <[email protected]>
+
+	* gnus-registry.el (gnus-registry--split-fancy-with-parent-internal):
+	Track by subject first, then sender.
+
 2011-04-14  Teodor Zlatanov  <[email protected]>
 
 	* gnus-registry.el: Updated gnus-registry docs.
diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 9f95ce7..77ed5a5 100644
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -425,58 +425,59 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
       (setq found (gnus-registry-post-process-groups
                    "references" refstr found)))
 
-     ;; else: there were no matches, try the extra tracking by sender
+     ;; else: there were no matches, now try the extra tracking by subject
      (when (and (null found)
-                (memq 'sender gnus-registry-track-extra)
-                sender
-                (not (gnus-grep-in-list
-                      sender
-                      gnus-registry-unfollowed-addresses)))
+                (memq 'subject gnus-registry-track-extra)
+                subject
+                (< gnus-registry-minimum-subject-length (length subject)))
        (let ((groups (apply
                       'append
                       (mapcar
                        (lambda (reference)
                          (gnus-registry-get-id-key reference 'group))
-                       (registry-lookup-secondary-value db 'sender sender)))))
+                       (registry-lookup-secondary-value db 'subject subject)))))
          (setq found
                (loop for group in groups
                      when (gnus-registry-follow-group-p group)
                      do (gnus-message
                          ;; warn more if gnus-registry-track-extra
                          (if gnus-registry-track-extra 7 9)
-                         "%s (extra tracking) traced sender '%s' to %s"
-                         log-agent sender group)
-                     collect group)))
-
+                         "%s (extra tracking) traced subject '%s' to %s"
+                         log-agent subject group)
+                     collect group))
        ;; filter the found groups and return them
        ;; the found groups are NOT the full groups
        (setq found (gnus-registry-post-process-groups
-                    "sender" sender found)))
+                      "subject" subject found))))
 
-     ;; else: there were no matches, now try the extra tracking by subject
+     ;; else: there were no matches, try the extra tracking by sender
      (when (and (null found)
-                (memq 'subject gnus-registry-track-extra)
-                subject
-                (< gnus-registry-minimum-subject-length (length subject)))
+                (memq 'sender gnus-registry-track-extra)
+                sender
+                (not (gnus-grep-in-list
+                      sender
+                      gnus-registry-unfollowed-addresses)))
        (let ((groups (apply
                       'append
                       (mapcar
                        (lambda (reference)
                          (gnus-registry-get-id-key reference 'group))
-                       (registry-lookup-secondary-value db 'subject subject)))))
+                       (registry-lookup-secondary-value db 'sender sender)))))
          (setq found
                (loop for group in groups
                      when (gnus-registry-follow-group-p group)
                      do (gnus-message
                          ;; warn more if gnus-registry-track-extra
                          (if gnus-registry-track-extra 7 9)
-                         "%s (extra tracking) traced subject '%s' to %s"
-                         log-agent subject group)
-                     collect group))
+                         "%s (extra tracking) traced sender '%s' to %s"
+                         log-agent sender group)
+                     collect group)))
+
          ;; filter the found groups and return them
          ;; the found groups are NOT the full groups
          (setq found (gnus-registry-post-process-groups
-                      "subject" subject found))))
+                    "sender" sender found)))
+
      ;; after the (cond) we extract the actual value safely
      (car-safe found)))
 

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog        |    5 +++++
 lisp/gnus-registry.el |   49 +++++++++++++++++++++++++------------------------
 2 files changed, 30 insertions(+), 24 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project