* many files: Remove trailing whitespaces, replace spc+tab with

[gnus] / lisp / nnimap.el

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index d597770..0926414 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -172,7 +172,7 @@ group/function elements."
                         (nnimap-strict-function :tag "User-defined function"))
                 (repeat :menu-tag "Multi-server (extended)"
                         :tag "Multi-server list"
-                        (list (regexp :tag "Server regexp") 
+                        (list (regexp :tag "Server regexp")
                               (list (regexp :tag "Incoming Mailbox regexp")
                                     (repeat :tag "Rules for matching server(s) and mailbox(es)"
                                             (list (string :tag "Destination mailbox")
@@ -196,7 +196,7 @@ RFC2060 section 6.4.4."
 
 ;; Performance / bug workaround variables
 
-(defcustom nnimap-close-asynchronous nil
+(defcustom nnimap-close-asynchronous t
   "Close mailboxes asynchronously in `nnimap-close-group'.
 This means that errors cought by nnimap when closing the mailbox will
 not prevent Gnus from updating the group status, which may be harmful.
@@ -859,15 +859,17 @@ function is generally only called when Gnus is shutting down."
     (when (and (imap-opened)
               (nnimap-possibly-change-group group server))
       (case nnimap-expunge-on-close
-       (always (unless nnimap-dont-close
+       (always (progn
                  (imap-mailbox-expunge nnimap-close-asynchronous)
-                 (imap-mailbox-close nnimap-close-asynchronous)))
+                 (unless nnimap-dont-close
+                   (imap-mailbox-close nnimap-close-asynchronous))))
        (ask (if (and (imap-search "DELETED")
                      (gnus-y-or-n-p (format "Expunge articles in group `%s'? "
                                             imap-current-mailbox)))
-                (unless nnimap-dont-close
+                (progn
                   (imap-mailbox-expunge nnimap-close-asynchronous)
-                  (imap-mailbox-close nnimap-close-asynchronous))
+                  (unless nnimap-dont-close
+                    (imap-mailbox-close nnimap-close-asynchronous)))
               (imap-mailbox-unselect)))
        (t (imap-mailbox-unselect)))
       (not imap-current-mailbox))))
@@ -934,7 +936,7 @@ function is generally only called when Gnus is shutting down."
        (or (member "\\NoSelect"
                    (imap-mailbox-get 'list-flags group nnimap-server-buffer))
            (let ((info (nnimap-find-minmax-uid group 'examine)))
-             (when (> (or (imap-mailbox-get 'recent group 
+             (when (> (or (imap-mailbox-get 'recent group
                                             nnimap-server-buffer) 0)
                       0)
                (push (list (cons group 0)) nnmail-split-history))