[gnus git] branch master updated: n0-17-106-g06c2797 =1= (nnimap-process-expiry-targets): Say what target we're expiring articles to.

       via  06c2797b955a396448f567ba5182312969d2e636 (commit)
      from  e19c1ce755bfd7bbbc5c225e09ac8af79cb67848 (commit)


- Log -----------------------------------------------------------------
commit 06c2797b955a396448f567ba5182312969d2e636
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Jun 30 04:43:06 2011 +0200

    (nnimap-process-expiry-targets): Say what target we're expiring articles to.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a76d241..b7ea8c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-06-30  Lars Magne Ingebrigtsen  <[email protected]>
 
+	* 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).
 
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index e78c20b..e330a4b 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -880,15 +880,18 @@ textual parts.")
 	  (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
+	      (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)
-		  (setq target nil)))
+			(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.

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    3 +++
 lisp/nnimap.el |   17 ++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project