* gnus-registry.el (gnus-registry-split-fancy-with-parent): Don't split

by sender if it's equal to user-mail-address, it's likely to be
useless.

* mail-source.el (mail-source-bind): Don't use server unless
it's bound, and default it to empty string otherwise.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f3e3a1..8570ab6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
 2008-04-26  Teodor Zlatanov  <tzz@lifelogs.com>
 
+       * gnus-registry.el (gnus-registry-split-fancy-with-parent): Don't split
+       by sender if it's equal to user-mail-address, it's likely to be
+       useless.
+
        * mail-source.el (mail-source-bind): Don't use user or password if they
-       are not bound.  Unintern them if they are nil.
+       are not bound.  Unintern them if they are nil.  Don't use server unless
+       it's bound, and default it to empty string otherwise.
 
 2008-04-25  Teodor Zlatanov  <tzz@lifelogs.com>
 

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index 93ee0ef..281c29c 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -523,8 +523,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                   "references" refstr found found)))
      
      ;; else: there were no matches, now try the extra tracking by sender
-     ((and (gnus-registry-track-sender-p) 
-          sender)
+     ((and (gnus-registry-track-sender-p)
+          sender
+          (not (equal sender user-mail-address)))
       (maphash
        (lambda (key value)
         (let ((this-sender (cdr

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 65626b0..131a12b 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -455,14 +455,16 @@ the `mail-source-keyword-map' variable."
            (or
             (auth-source-user-or-password
              "login"
-             server          ; this is "host" in auth-sources
+             ;; this is "host" in auth-sources
+             (if (boundp 'server) (symbol-value 'server) "")
              ',(car type-source))
             (when (boundp 'user) (symbol-value 'user))))
           (password 
            (or
             (auth-source-user-or-password 
              "password"
-             server          ; this is "host" in auth-sources
+             ;; this is "host" in auth-sources
+             (if (boundp 'server) (symbol-value 'server) "")
              ',(car type-source))
             (when (boundp 'user) (symbol-value 'user)))))
        (unless user