Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2ebdfa..0a8b138 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-16  Simon Josefsson  <jas@pdc.kth.se>
+
+       * nnimap.el (nnimap-request-accept-article): Don't unselect
+       mailbox if no mailbox is selected.
+
 2000-05-15  Per Abrahamsen  <abraham@dina.kvl.dk>
 
        * gnus-art.el (gnus-button-url-regexp): Revert earlier change.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f50f21e..67c4f5a 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1065,8 +1065,9 @@ function is generally only called when Gnus is shutting down."
                    (goto-char (point-min))
                    (while (search-forward "\n" nil t)
                      (replace-match "\r\n")))
-                 ;; next line for Cyrus server bug
-                 (imap-mailbox-unselect nnimap-server-buffer)
+                  ;; this 'or' is for Cyrus server bug
+                  (or (null (imap-current-mailbox nnimap-server-buffer))
+                      (imap-mailbox-unselect nnimap-server-buffer))
                  (imap-message-append group (current-buffer) nil nil
                                       nnimap-server-buffer)))
          (cons group (nth 1 uid))