bug#19950: 25.0.50; Gnus nnimap -- don't split messages back into original group

[Eric Abrahamsen <eric@ericabrahamsen.net>]

[-- Attachment #1: Type: text/plain, Size: 663 bytes --]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> If this is acceptable, does it need a CHANGELOG mention? I've gotten
>> pretty confused about what's LOG-worthy, and what isn't.
>
> The ChangeLog duplicates the commit messages, and since every commit should
> have a commit message, then every commit should add that same message
> to the relevant ChangeLog.
>
> At least for now, until we finally change our procedure to auto-generate
> the ChangeLog files (should be "real soon now", tho there hasn't been
> much activity in this area of late).

Thanks to you both! Here's a new patch with ChangeLog added. I'll just
leave this here until Lars sees it...


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Don-t-split-imap-messages-back-into-original-group.patch --]
[-- Type: text/x-diff, Size: 1814 bytes --]

From ffbbdec9909bc08d853d239b798bd33726e6fa82 Mon Sep 17 00:00:00 2001
From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Wed, 18 Feb 2015 17:51:37 +0800
Subject: [PATCH] Don't split imap messages back into original group

* lisp/nnimap.el (nnimap-split-incoming-mail): If a message is already
  in the group it should be split to, don't re-copy it into the group.
---
 lisp/ChangeLog |  4 ++++
 lisp/nnimap.el | 15 +++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2047481..011e3cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-27  Eric Abrahamsen  <eric@ericabrahamsen.net>
+	* lisp/nnimap.el (nnimap-split-incoming-mail): If a message is already
+	in the group it should be split to, don't re-copy it into the group.
+
 2015-02-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-mime-inline-part, gnus-mm-display-part):
diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 369d9d3..c476be6 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -2086,12 +2086,15 @@ Return the server's response to the SELECT or EXAMINE command."
 		    (ranges (cdr spec)))
 		(if (eq group 'junk)
 		    (setq junk-articles ranges)
-		  (push (list (nnimap-send-command
-			       "UID COPY %s %S"
-			       (nnimap-article-ranges ranges)
-			       (utf7-encode group t))
-			      ranges)
-			sequences))))
+		  ;; Don't copy if the message is already in its
+		  ;; target group.
+		  (unless (string= group nnimap-inbox)
+		   (push (list (nnimap-send-command
+				"UID COPY %s %S"
+				(nnimap-article-ranges ranges)
+				(utf7-encode group t))
+			       ranges)
+			 sequences)))))
 	    ;; Wait for the last COPY response...
 	    (when sequences
 	      (nnimap-wait-for-response (caar sequences))
-- 
2.3.1