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

diff --git a/ed/70d2ec558be9adf9412816af3156f367bfd0ac b/ed/70d2ec558be9adf9412816af3156f367bfd0ac
new file mode 100644 (file)
index 0000000..b8bc4d4
--- /dev/null
+++ b/ed/70d2ec558be9adf9412816af3156f367bfd0ac
@@ -0,0 +1,97 @@
+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 252E1431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:21 -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 cKXlP6ncRrsN for <notmuch@notmuchmail.org>;\r
+       Tue, 22 Oct 2013 17:22:15 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0BB0B429E26\r
+       for <notmuch@notmuchmail.org>; Tue, 22 Oct 2013 17:22:07 -0700 (PDT)\r
+X-AuditID: 12074422-b7f5a8e000000a34-0a-526716af9433\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 5F.C5.02612.FA617625; Tue, 22 Oct 2013 20:22:07 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r9N0M59P017166; \r
+       Tue, 22 Oct 2013 20:22:05 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (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 r9N0M3uM005845\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 22 Oct 2013 20:22:04 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VYmD5-0008KN-QR; Tue, 22 Oct 2013 20:22:03 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 5/8] pick: Fix incorrect use of `notmuch-pick-tag'\r
+Date: Tue, 22 Oct 2013 20:21:58 -0400\r
+Message-Id: <1382487721-31776-6-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+In-Reply-To: <1382487721-31776-1-git-send-email-amdragon@mit.edu>\r
+References: <1382487721-31776-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nrrteLD3IoHG2scXquTwW12/OZHZg\r
+       8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MjZueMpcsIajYkrLT+YGxh72LkZODgkBE4kz\r
+       S+eyQthiEhfurWcDsYUE9jFKXHsPZHMB2RsZJb79usUK4dxhknh89ggjRNVcRolp78pAbDYB\r
+       DYlt+5eDxUUEpCV23p0NNpVZwFHi8/5FYFOFBVwl5s34ChZnEVCVuHlgJ9gVvAIOEoc6rkBd\r
+       pCSx8NQ2sBpOoN43Oz5AXeQgMWXnGZYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrq\r
+       5WaW6KWmlG5iBIeRi9IOxp8HlQ4xCnAwKvHwPmhJCxJiTSwrrsw9xCjJwaQkyqvOnx4kxJeU\r
+       n1KZkVicEV9UmpNafIhRgoNZSYS32ReonDclsbIqtSgfJiXNwaIkznuLwz5ISCA9sSQ1OzW1\r
+       ILUIJivDwaEkwdslCjRUsCg1PbUiLTOnBCHNxMEJMpwHaPgKkBre4oLE3OLMdIj8KUZFKXHe\r
+       MyAJAZBERmkeXC8szl8xigO9IgzRzgNMEXDdr4AGMwENnrIE5OrikkSElFQDo4/dhzu8gsY3\r
+       JSV3pfy61LFa5vGnCwv7nnw8Jrz3xk+fTs0JlReYnKLEtm7a2lLu1HNk/Smv6EXXCv2StWNe\r
+       cr6yeL4q8EHGbdYPPFZiGiL3Nl9zKArTvP5u/qoz7qwXwidbJEeeN2CMnrQ+XayuLVc5UcM9\r
+       do+68Leir70mDo+corWLrzXOU2Ipzkg01GIuKk4EACNgFtjOAgAA\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: Wed, 23 Oct 2013 00:22:21 -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