mail-source.el (mail-source-set-1, mail-source-bind): Moved

auth-source code out of the macro to clean it up and fix bugs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8570ab6..a9d0a06 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-28  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * mail-source.el (mail-source-set-1, mail-source-bind): Moved
+       auth-source code out of the macro to clean it up and fix bugs.
+
 2008-04-26  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-split-fancy-with-parent): Don't split

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 131a12b..248fcaa 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -451,27 +451,7 @@ The variables bound and their default values are described by
 the `mail-source-keyword-map' variable."
   `(let* ,(mail-source-bind-1 (car type-source))
      (mail-source-set-1 ,(cadr type-source))
-     (let ((user 
-           (or
-            (auth-source-user-or-password
-             "login"
-             ;; 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"
-             ;; this is "host" in auth-sources
-             (if (boundp 'server) (symbol-value 'server) "")
-             ',(car type-source))
-            (when (boundp 'user) (symbol-value 'user)))))
-       (unless user
-        (unintern 'user))
-       (unless password
-        (unintern 'password))
-       ,@body)))
+     ,@body))
 
 (put 'mail-source-bind 'lisp-indent-function 1)
 (put 'mail-source-bind 'edebug-form-spec '(sexp body))
@@ -479,14 +459,37 @@ the `mail-source-keyword-map' variable."
 (defun mail-source-set-1 (source)
   (let* ((type (pop source))
         (defaults (cdr (assq type mail-source-keyword-map)))
-        default value keyword)
+        default value keyword user-auth pass-auth)
     (while (setq default (pop defaults))
       ;; for each default :SYMBOL, set SYMBOL to the plist value for :SYMBOL
       ;; using `mail-source-value' to evaluate the plist value
       (set (mail-source-strip-keyword (setq keyword (car default)))
-          (if (setq value (plist-get source keyword))
-              (mail-source-value value)
-            (mail-source-value (cadr default)))))))
+          ;; note the following reasons for this structure:
+          ;; 1) the auth-sources user and password override everything
+          ;; 2) it avoids macros, so it's cleaner
+          ;; 3) it falls through to the mail-sources and then default values
+          (cond 
+           ((and
+            (eq keyword :user)
+            (setq user-auth 
+                  (auth-source-user-or-password
+                   "login"
+                   ;; this is "host" in auth-sources
+                   (if (boundp 'server) (symbol-value 'server) "")
+                   type)))
+            user-auth)
+           ((and
+            (eq keyword :password)
+            (setq pass-auth 
+                  (auth-source-user-or-password
+                   "password"
+                   ;; this is "host" in auth-sources
+                   (if (boundp 'server) (symbol-value 'server) "")
+                   type)))
+            pass-auth)
+           (t (if (setq value (plist-get source keyword))
+                (mail-source-value value)
+              (mail-source-value (cadr default)))))))))
 
 (eval-and-compile
   (defun mail-source-bind-common-1 ()