nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4b7d393cd21..1a695c9f039 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-22  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
+
 2010-09-22  Julien Danjou  <julien@danjou.info>
 
         * gnus-group.el (gnus-group-update-hook): Call gnus-group-add-icon by
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e43cd2d8afb..63c61080a6a 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -580,7 +580,10 @@ textual parts.")
       t)
      (nnimap-expunge
       (nnimap-command "EXPUNGE")
-      t))))
+      t)
+     (t (gnus-message 7 (concat "nnimap: nnimap-expunge is not set and the "
+                                "server doesn't support UIDPLUS, so we won't "
+                                "delete this article now"))))))
 
 (deffoo nnimap-request-scan (&optional group server)
   (when (and (nnimap-possibly-change-group nil server)