(imap-authenticate): Use current-buffer instead of buffer,

for the cases where imap-authenticate is called with a nil buffer
parameter.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00083bd..c75990d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-21  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * imap.el (imap-authenticate): Use current-buffer instead of buffer,
+       for the cases where imap-authenticate is called with a nil buffer
+       parameter.
+
 2007-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-browse-html-parts): Work for two or more

diff --git a/lisp/imap.el b/lisp/imap.el
index 40e41d7..4f1ef94 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1177,18 +1177,18 @@ password is remembered in the buffer."
       (if passwd (setq imap-password passwd))
       (if imap-auth
          (and (funcall (nth 2 (assq imap-auth
-                                    imap-authenticator-alist)) buffer)
+                                    imap-authenticator-alist)) (current-buffer))
               (setq imap-state 'auth))
        ;; Choose authenticator.
        (let ((auths imap-authenticators)
              auth)
          (while (setq auth (pop auths))
            ;; OK to use authenticator?
-           (when (funcall (nth 1 (assq auth imap-authenticator-alist)) buffer)
+           (when (funcall (nth 1 (assq auth imap-authenticator-alist)) (current-buffer))
              (message "imap: Authenticating to `%s' using `%s'..."
                       imap-server auth)
              (setq imap-auth auth)
-             (if (funcall (nth 2 (assq auth imap-authenticator-alist)) buffer)
+             (if (funcall (nth 2 (assq auth imap-authenticator-alist)) (current-buffer))
                  (progn
                    (message "imap: Authenticating to `%s' using `%s'...done"
                             imap-server auth)