From 7f2f8513dee72a3ac9962e01eb40078d5745cf26 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 23 Oct 2013 20:21:58 +2000 Subject: [PATCH] [PATCH v2 5/8] pick: Fix incorrect use of `notmuch-pick-tag' --- ed/70d2ec558be9adf9412816af3156f367bfd0ac | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 ed/70d2ec558be9adf9412816af3156f367bfd0ac diff --git a/ed/70d2ec558be9adf9412816af3156f367bfd0ac b/ed/70d2ec558be9adf9412816af3156f367bfd0ac new file mode 100644 index 000000000..b8bc4d433 --- /dev/null +++ b/ed/70d2ec558be9adf9412816af3156f367bfd0ac @@ -0,0 +1,97 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 252E1431FBF + for ; Tue, 22 Oct 2013 17:22:21 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id cKXlP6ncRrsN for ; + Tue, 22 Oct 2013 17:22:15 -0700 (PDT) +Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu + [18.7.68.34]) + by olra.theworths.org (Postfix) with ESMTP id 0BB0B429E26 + for ; Tue, 22 Oct 2013 17:22:07 -0700 (PDT) +X-AuditID: 12074422-b7f5a8e000000a34-0a-526716af9433 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP + id 5F.C5.02612.FA617625; Tue, 22 Oct 2013 20:22:07 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r9N0M59P017166; + Tue, 22 Oct 2013 20:22:05 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9N0M3uM005845 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 22 Oct 2013 20:22:04 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VYmD5-0008KN-QR; Tue, 22 Oct 2013 20:22:03 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 5/8] pick: Fix incorrect use of `notmuch-pick-tag' +Date: Tue, 22 Oct 2013 20:21:58 -0400 +Message-Id: <1382487721-31776-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.8.4.rc3 +In-Reply-To: <1382487721-31776-1-git-send-email-amdragon@mit.edu> +References: <1382487721-31776-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nrrteLD3IoHG2scXquTwW12/OZHZg + 8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4MjZueMpcsIajYkrLT+YGxh72LkZODgkBE4kz + S+eyQthiEhfurWcDsYUE9jFKXHsPZHMB2RsZJb79usUK4dxhknh89ggjRNVcRolp78pAbDYB + DYlt+5eDxUUEpCV23p0NNpVZwFHi8/5FYFOFBVwl5s34ChZnEVCVuHlgJ9gVvAIOEoc6rkBd + pCSx8NQ2sBpOoN43Oz5AXeQgMWXnGZYJjPwLGBlWMcqm5Fbp5iZm5hSnJusWJyfm5aUW6Zrq + 5WaW6KWmlG5iBIeRi9IOxp8HlQ4xCnAwKvHwPmhJCxJiTSwrrsw9xCjJwaQkyqvOnx4kxJeU + n1KZkVicEV9UmpNafIhRgoNZSYS32ReonDclsbIqtSgfJiXNwaIkznuLwz5ISCA9sSQ1OzW1 + ILUIJivDwaEkwdslCjRUsCg1PbUiLTOnBCHNxMEJMpwHaPgKkBre4oLE3OLMdIj8KUZFKXHe + MyAJAZBERmkeXC8szl8xigO9IgzRzgNMEXDdr4AGMwENnrIE5OrikkSElFQDo4/dhzu8gsY3 + JSV3pfy61LFa5vGnCwv7nnw8Jrz3xk+fTs0JlReYnKLEtm7a2lLu1HNk/Smv6EXXCv2StWNe + cr6yeL4q8EHGbdYPPFZiGiL3Nl9zKArTvP5u/qoz7qwXwidbJEeeN2CMnrQ+XayuLVc5UcM9 + do+68Leir70mDo+corWLrzXOU2Ipzkg01GIuKk4EACNgFtjOAgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 23 Oct 2013 00:22:21 -0000 + +`notmuch-pick-tag' takes a list of tag changes, but +`notmuch-pick-archive-message' passes it a &rest argument. This +happens to work if `notmuch-archive-tags' contains a single tag (which +it usually does), but will break if it does not. +--- + contrib/notmuch-pick/notmuch-pick.el | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index 0aa651e..8f504ed 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -542,8 +542,7 @@ message will be \"unarchived\", i.e. the tag changes in + `notmuch-archive-tags' will be reversed." + (interactive "P") + (when notmuch-archive-tags +- (apply 'notmuch-pick-tag +- (notmuch-tag-change-list notmuch-archive-tags unarchive)))) ++ (notmuch-pick-tag (notmuch-tag-change-list notmuch-archive-tags unarchive)))) + + (defun notmuch-pick-archive-message-then-next (&optional unarchive) + "Archive the current message and move to next matching message." +-- +1.8.4.rc3 + -- 2.26.2