* imap.el (imap-gssapi-open): Don't wait for logout to complete.

	(imap-kerberos4-open): Ditto.
	(imap-open): Set port correctly, don't set auth.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88cb830..9c145c0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-19  Simon Josefsson  <jas@extundo.com>
+
+       * imap.el (imap-gssapi-open): Don't wait for logout to complete.
+       (imap-kerberos4-open): Ditto.
+       (imap-open): Set port correctly, don't set auth.
+
 2002-01-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.el (gnus-version-number): Bump version number.

diff --git a/lisp/imap.el b/lisp/imap.el
index 15894ff..63b7b93 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -528,7 +528,7 @@ If ARGS, PROMPT is used as an argument to `format'."
                                (not (string-match "failed" response))))
                (setq done process)
              (if (memq (process-status process) '(open run))
-                 (imap-send-command-wait "LOGOUT"))
+                 (imap-send-command "LOGOUT"))
              (delete-process process)
              nil)))))
     done))
@@ -588,7 +588,7 @@ If ARGS, PROMPT is used as an argument to `format'."
                                (not (string-match "failed" response))))
                (setq done process)
              (if (memq (process-status process) '(open run))
-                 (imap-send-command-wait "LOGOUT"))
+                 (imap-send-command "LOGOUT"))
              (delete-process process)
              nil)))))
     done))
@@ -957,8 +957,8 @@ necessery.  If nil, the buffer name is generated."
                    (imap-disable-multibyte)
                    (buffer-disable-undo)
                    (setq imap-server (or server imap-server))
-                   (setq imap-port imap-port)
-                   (setq imap-auth imap-auth)
+                   (setq imap-port (or port imap-port))
+                   (setq imap-auth (or auth imap-auth))
                    (message "imap: Reconnecting with stream `%s'..." stream)
                    (if (null (let ((imap-stream stream))
                                (imap-open-1 (current-buffer))))