[Emacs-diffs] /srv/bzr/emacs/trunk r104802: nnimap.el (nnimap-process-expiry-targets): Say what target we're expiring articles to.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104802
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-30 04:07:50 +0000
message:
  nnimap.el (nnimap-process-expiry-targets): Say what target we're expiring 
articles to.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-06-30 03:01:09 +0000
+++ b/lisp/gnus/ChangeLog       2011-06-30 04:07:50 +0000
@@ -6,6 +6,9 @@
 
 2011-06-30  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * nnimap.el (nnimap-process-expiry-targets): Say what target we're
+       expiring articles to.
+
        * mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4
        variations as ASCII (bug#5458).
 

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-06-30 01:02:47 +0000
+++ b/lisp/gnus/nnimap.el       2011-06-30 04:07:50 +0000
@@ -880,15 +880,18 @@
          (with-temp-buffer
            (mm-disable-multibyte)
            (when (nnimap-request-article article group server (current-buffer))
-             (nnheader-message 7 "Expiring article %s:%d" group article)
              (when (functionp target)
                (setq target (funcall target group)))
-             (when (and target
-                        (not (eq target 'delete)))
-               (if (or (gnus-request-group target t)
-                       (gnus-request-create-group target))
-                   (nnmail-expiry-target-group target group)
-                 (setq target nil)))
+             (if (and target
+                      (not (eq target 'delete)))
+                 (if (or (gnus-request-group target t)
+                         (gnus-request-create-group target))
+                     (progn
+                       (nnmail-expiry-target-group target group)
+                       (nnheader-message 7 "Expiring article %s:%d to %s"
+                                         group article target))
+                   (setq target nil))
+               (nnheader-message 7 "Expiring article %s:%d" group article))
              (when target
                (push article deleted-articles))))))))
     ;; Change back to the current group again.