[PATCH 5/8] pick: Fix incorrect use of `notmuch-pick-tag'

diff --git a/e4/bc24481435b9f8260c81be4621328bda4cb04d b/e4/bc24481435b9f8260c81be4621328bda4cb04d
new file mode 100644 (file)
index 0000000..53acf69
--- /dev/null
+++ b/e4/bc24481435b9f8260c81be4621328bda4cb04d
@@ -0,0 +1,96 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 671C7431FBC\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:22 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id DU-MLMIVVDfQ for <notmuch@notmuchmail.org>;\r
+       Tue, 22 Oct 2013 12:51:18 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 46314431E62\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 12:51:08 -0700 (PDT)\r
+X-AuditID: 1209190e-b7f828e0000009cf-1c-5266d72945f4\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 92.0E.02511.927D6625; Tue, 22 Oct 2013 15:51:05 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r9MJp39g015069; \r
+       Tue, 22 Oct 2013 15:51:04 -0400\r
+Received: from drake.dyndns.org (31-33-57.wireless.csail.mit.edu\r
+       [128.31.33.57]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9MJp1VH005198\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 22 Oct 2013 15:51:03 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VYhym-0006yn-Q9; Tue, 22 Oct 2013 15:51:00 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/8] pick: Fix incorrect use of `notmuch-pick-tag'\r
+Date: Tue, 22 Oct 2013 15:50:54 -0400\r
+Message-Id: <1382471457-26056-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+References: <1382471457-26056-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrKt5PS3I4OE2S4vrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoErY+OGp8wFazgqprT8ZG5g7GHvYuTkkBAwkZj06yAbhC0mceHe\r
+       ejBbSGAfo8T7N3VdjFxA9kZGic/7l7FDJI4xSSycIACRmMsosfXOHVaQBJuAhsS2/csZQWwR\r
+       AWmJnXdnA8U5OJgF1CT+dKmAhIUFnCRO3PsDtoBFQFVi/9KbzCA2r4CDxIwpmxghjlCSWHhq\r
+       G9hITgFHien7/rGBjBECqjl1h2MCI/8CRoZVjLIpuVW6uYmZOcWpybrFyYl5ealFusZ6uZkl\r
+       eqkppZsYwQEjybeD8etBpUOMAhyMSjy8Fu1pQUKsiWXFlbmHGCU5mJREeSOuAoX4kvJTKjMS\r
+       izPii0pzUosPMUpwMCuJ8Db7AuV4UxIrq1KL8mFS0hwsSuK8Nznsg4QE0hNLUrNTUwtSi2Cy\r
+       MhwcShK8j0CGChalpqdWpGXmlCCkmTg4QYbzAA0/BlLDW1yQmFucmQ6RP8WoKCXOuwQkIQCS\r
+       yCjNg+uFRfQrRnGgV4Qh2nmAyQCu+xXQYCagwVOWgA0uSURISTUwKrtOmWZ0g+eY5IWZr/uO\r
+       Rcx2ef659PGi3ltZ/yvTw22TLimLLMuW56j+pvFQ+m5z0x8v1mj+87cn/jAU4s0ImrzP/uXU\r
+       ydaWojre8Ub586aLNz1rTr7xntdvvsH+QCc503Ubvs4v1/h3OiA06lKZhKtR9JMzNum5s/KF\r
+       GO3zzmUlB/d/3p6ixFKckWioxVxUnAgAEjWWO8MCAAA=\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 22 Oct 2013 19:51:22 -0000\r
+\r
+`notmuch-pick-tag' takes a list of tag changes, but\r
+`notmuch-pick-archive-message' passes it a &rest argument.  This\r
+happens to work if `notmuch-archive-tags' contains a single tag (which\r
+it usually does), but will break if it does not.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el | 3 +--\r
+ 1 file changed, 1 insertion(+), 2 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 0aa651e..8f504ed 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -542,8 +542,7 @@ message will be \"unarchived\", i.e. the tag changes in\r
+ `notmuch-archive-tags' will be reversed."\r
+   (interactive "P")\r
+   (when notmuch-archive-tags\r
+-    (apply 'notmuch-pick-tag\r
+-         (notmuch-tag-change-list notmuch-archive-tags unarchive))))\r
++    (notmuch-pick-tag (notmuch-tag-change-list notmuch-archive-tags unarchive))))\r
+ \r
+ (defun notmuch-pick-archive-message-then-next (&optional unarchive)\r
+   "Archive the current message and move to next matching message."\r
+-- \r
+1.8.4.rc3\r
+\r