Expunge IMAP groups by default on article deletion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0299df0..40f08da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-expunge-inbox): Removed.
+       (nnimap-mark-and-expunge-incoming): Use nnimap-expunge instead.
+       (nnimap-expunge): Flip default to t.
+
        * gnus.el (gnus-method-to-server): Don't push things to the cache
        unless it's unique.
        (gnus-server-to-method): Ditto.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 63c6108..4a77836 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -62,11 +62,6 @@ Values are `ssl' and `network'.")
 (defvoo nnimap-inbox nil
   "The mail box where incoming mail arrives and should be split out of.")
 
-(defvoo nnimap-expunge-inbox nil
-  "If non-nil, expunge the inbox after fetching mail.
-This is always done if the server supports UID EXPUNGE, but it's
-not done by default on servers that doesn't support that command.")
-
 (defvoo nnimap-authenticator nil
   "How nnimap authenticate itself to the server.
 Possible choices are nil (use default methods) or `anonymous'.")
@@ -78,7 +73,11 @@ will fetch all parts that have types that match that string.  A
 likely value would be \"text/\" to automatically fetch all
 textual parts.")
 
-(defvoo nnimap-expunge nil)
+(defvoo nnimap-expunge t
+  "If non-nil, expunge articles after deleting them.
+This is always done if the server supports UID EXPUNGE, but it's
+not done by default on servers that doesn't support that command.")
+
 
 (defvoo nnimap-connection-alist nil)
 
@@ -1125,7 +1124,7 @@ textual parts.")
        (setq sequence (nnimap-send-command "UID EXPUNGE %s" range)))
        ;; If it doesn't support UID EXPUNGE, then we only expunge if the
        ;; user has configured it.
-       (nnimap-expunge-inbox
+       (nnimap-expunge
        (setq sequence (nnimap-send-command "EXPUNGE"))))
       (nnimap-wait-for-response sequence))))