[Emacs-diffs] /srv/bzr/emacs/trunk r101538: nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 101538
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-22 13:34:37 +0000
message:
  nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-09-22 12:49:48 +0000
+++ b/lisp/gnus/ChangeLog       2010-09-22 13:34:37 +0000
@@ -1,3 +1,7 @@
+2010-09-22  Teodor Zlatanov  <address@hidden>
+
+       * nnimap.el (nnimap-delete-article): Tell user if expunge won't happen.
+
 2010-09-22  Julien Danjou  <address@hidden>
 
        * gnus-group.el (gnus-group-update-hook): Call gnus-group-add-icon by

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2010-09-21 23:13:46 +0000
+++ b/lisp/gnus/nnimap.el       2010-09-22 13:34:37 +0000
@@ -580,7 +580,10 @@
       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)