* imap.el (imap-open): Handle case where buffer is a buffer

	object.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d6d4d99a85364d5eac3b022411aa366bc6bef217..320132460a309597acd124697beda5053857ff15 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-30  Chong Yidong  <cyd@stupidchicken.com>
+
+       * imap.el (imap-open): Handle case where buffer is a buffer
+       object.
+
 2005-10-24  Eli Zaretskii  <eliz@gnu.org>
 
        * pgg-def.el:

diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index b66d9eded8abab145e12254cf2310a01850ddcb8..2be30aa6e47f7ea14a290851c312cac2fadc4e92 100644 (file)
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -1038,8 +1038,11 @@ necessary.  If nil, the buffer name is generated."
                           stream))
                      ;; We're done, kill the first connection
                      (imap-close buffer)
-                     (kill-buffer buffer)
-                     (rename-buffer buffer)
+                     (let ((name (if (stringp buffer)
+                                     buffer
+                                   (buffer-name buffer))))
+                       (kill-buffer buffer)
+                       (rename-buffer name))
                      (message "imap: Reconnecting with stream `%s'...done"
                               stream)
                      (setq imap-stream stream)