From 2ee42624a6069cf91f228bdf578e3e5d1f044d5d Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 16 May 2000 22:07:07 +0000 Subject: [PATCH] Sync. --- lisp/ChangeLog | 5 +++++ lisp/nnimap.el | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2ebdfa..0a8b138 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-05-16 Simon Josefsson + + * nnimap.el (nnimap-request-accept-article): Don't unselect + mailbox if no mailbox is selected. + 2000-05-15 Per Abrahamsen * gnus-art.el (gnus-button-url-regexp): Revert earlier change. diff --git a/lisp/nnimap.el b/lisp/nnimap.el index f50f21e..67c4f5a 100644 --- 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)) -- 1.7.10.4