Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 385a70f..e0cf614 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-27  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (nnimap-open-server): Set nnimap-server-buffer if
+       nnoo-change-server failed to do it.
+
 2001-07-26 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.el (gnus-parameters): Make it customizable.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index ea188f4..cdc06a2 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -646,6 +646,8 @@ If EXAMINE is non-nil the group is selected read-only."
                      (cadr (assq 'nnimap-server-address defs))) defs)
        (push (list 'nnimap-address server) defs)))
     (nnoo-change-server 'nnimap server defs)
+    (or nnimap-server-buffer
+       (setq nnimap-server-buffer (cadr (assq 'nnimap-server-buffer defs))))
     (with-current-buffer (get-buffer-create nnimap-server-buffer)
       (nnoo-change-server 'nnimap server defs))
     (or (and nnimap-server-buffer