From c51e4cf5ce9a5bf5e67e340007f79a9af7753426 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 23 Oct 2013 15:50:54 +2000 Subject: [PATCH] [PATCH 5/8] pick: Fix incorrect use of `notmuch-pick-tag' --- e4/bc24481435b9f8260c81be4621328bda4cb04d | 96 +++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 e4/bc24481435b9f8260c81be4621328bda4cb04d diff --git a/e4/bc24481435b9f8260c81be4621328bda4cb04d b/e4/bc24481435b9f8260c81be4621328bda4cb04d new file mode 100644 index 000000000..53acf69f9 --- /dev/null +++ b/e4/bc24481435b9f8260c81be4621328bda4cb04d @@ -0,0 +1,96 @@ +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 671C7431FBC + for ; Tue, 22 Oct 2013 12:51:22 -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 DU-MLMIVVDfQ for ; + Tue, 22 Oct 2013 12:51:18 -0700 (PDT) +Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu + [18.9.25.14]) + by olra.theworths.org (Postfix) with ESMTP id 46314431E62 + for ; Tue, 22 Oct 2013 12:51:08 -0700 (PDT) +X-AuditID: 1209190e-b7f828e0000009cf-1c-5266d72945f4 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP + id 92.0E.02511.927D6625; Tue, 22 Oct 2013 15:51:05 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r9MJp39g015069; + Tue, 22 Oct 2013 15:51:04 -0400 +Received: from drake.dyndns.org (31-33-57.wireless.csail.mit.edu + [128.31.33.57]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9MJp1VH005198 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Tue, 22 Oct 2013 15:51:03 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VYhym-0006yn-Q9; Tue, 22 Oct 2013 15:51:00 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 5/8] pick: Fix incorrect use of `notmuch-pick-tag' +Date: Tue, 22 Oct 2013 15:50:54 -0400 +Message-Id: <1382471457-26056-6-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.8.4.rc3 +In-Reply-To: <1382471457-26056-1-git-send-email-amdragon@mit.edu> +References: <1382471457-26056-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrKt5PS3I4OE2S4vrN2cyOzB6PFt1 + izmAMYrLJiU1J7MstUjfLoErY+OGp8wFazgqprT8ZG5g7GHvYuTkkBAwkZj06yAbhC0mceHe + ejBbSGAfo8T7N3VdjFxA9kZGic/7l7FDJI4xSSycIACRmMsosfXOHVaQBJuAhsS2/csZQWwR + AWmJnXdnA8U5OJgF1CT+dKmAhIUFnCRO3PsDtoBFQFVi/9KbzCA2r4CDxIwpmxghjlCSWHhq + G9hITgFHien7/rGBjBECqjl1h2MCI/8CRoZVjLIpuVW6uYmZOcWpybrFyYl5ealFusZ6uZkl + eqkppZsYwQEjybeD8etBpUOMAhyMSjy8Fu1pQUKsiWXFlbmHGCU5mJREeSOuAoX4kvJTKjMS + izPii0pzUosPMUpwMCuJ8Db7AuV4UxIrq1KL8mFS0hwsSuK8Nznsg4QE0hNLUrNTUwtSi2Cy + MhwcShK8j0CGChalpqdWpGXmlCCkmTg4QYbzAA0/BlLDW1yQmFucmQ6RP8WoKCXOuwQkIQCS + yCjNg+uFRfQrRnGgV4Qh2nmAyQCu+xXQYCagwVOWgA0uSURISTUwKrtOmWZ0g+eY5IWZr/uO + Rcx2ef659PGi3ltZ/yvTw22TLimLLMuW56j+pvFQ+m5z0x8v1mj+87cn/jAU4s0ImrzP/uXU + ydaWojre8Ub586aLNz1rTr7xntdvvsH+QCc503Ubvs4v1/h3OiA06lKZhKtR9JMzNum5s/KF + GO3zzmUlB/d/3p6ixFKckWioxVxUnAgAEjWWO8MCAAA= +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: Tue, 22 Oct 2013 19:51:22 -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