[Emacs-diffs] /srv/bzr/emacs/trunk r103926: nus-registry.el (gnus-registry--split-fancy-with-parent-internal): Track by subject first, then sender.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103926
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2011-04-15 14:29:02 +0000
message:
  nus-registry.el (gnus-registry--split-fancy-with-parent-internal): Track by 
subject first, then sender.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-registry.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-04-15 12:42:51 +0000
+++ b/lisp/gnus/ChangeLog       2011-04-15 14:29:02 +0000
@@ -1,8 +1,14 @@
+2011-04-15  Teodor Zlatanov  <address@hidden>
+
+       * gnus-registry.el (gnus-registry--split-fancy-with-parent-internal):
+       Track by subject first, then sender.
+
 2011-04-15  Stefan Monnier  <address@hidden>
 
        * message.el (message-bogus-system-names): Replace ^...$ => \`...\'.
 
-       * gnus.el (gnus-splash-svg-color-symbols): Don't use insert-file from 
Lisp.
+       * gnus.el (gnus-splash-svg-color-symbols): Don't use insert-file from
+       Lisp.
 
        * gnus-draft.el (gnus-draft-setup): New arg `dont-pop'.
        (gnus-draft-send): Use it to avoid popping

=== modified file 'lisp/gnus/gnus-registry.el'
--- a/lisp/gnus/gnus-registry.el        2011-04-14 10:41:00 +0000
+++ b/lisp/gnus/gnus-registry.el        2011-04-15 14:29:02 +0000
@@ -425,6 +425,31 @@
       (setq found (gnus-registry-post-process-groups
                    "references" refstr found)))
 
+     ;; else: there were no matches, now try the extra tracking by subject
+     (when (and (null found)
+                (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 '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 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
+                      "subject" subject found))))
+
      ;; else: there were no matches, try the extra tracking by sender
      (when (and (null found)
                 (memq 'sender gnus-registry-track-extra)
@@ -453,30 +478,6 @@
        (setq found (gnus-registry-post-process-groups
                     "sender" sender found)))
 
-     ;; else: there were no matches, now try the extra tracking by subject
-     (when (and (null found)
-                (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 '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 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
-                      "subject" subject found))))
      ;; after the (cond) we extract the actual value safely
      (car-safe found)))