From 1449e0994e0ccd09ce5f9780a9c9064dbc6ba8fa Mon Sep 17 00:00:00 2001 From: Teodor Zlatanov Date: Thu, 20 Dec 2007 22:32:43 +0000 Subject: [PATCH] (imap-authenticate): Use current-buffer instead of buffer, for the cases where imap-authenticate is called with a nil buffer parameter. --- lisp/ChangeLog | 6 ++++++ lisp/imap.el | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 00083bdc6..c75990d85 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-12-21 Teodor Zlatanov + + * 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 * gnus-art.el (gnus-article-browse-html-parts): Work for two or more diff --git a/lisp/imap.el b/lisp/imap.el index 40e41d79d..4f1ef94e0 100644 --- 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) -- 2.25.1