--- /dev/null
+Return-Path: <markwalters1009@gmail.com>\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 24ECB431FCF\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 10:31:27 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ 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 XN8UU7-f+CDG for <notmuch@notmuchmail.org>;\r
+ Mon, 26 Aug 2013 10:31:20 -0700 (PDT)\r
+Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com\r
+ [209.85.212.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 64C2B431FC0\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 10:31:20 -0700 (PDT)\r
+Received: by mail-wi0-f174.google.com with SMTP id c10so212587wiw.1\r
+ for <notmuch@notmuchmail.org>; Mon, 26 Aug 2013 10:31:16 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=1d5wWWKtE1EVmQNMYg9pd8E+3Vr4SPW27C9Sf6CqwjM=;\r
+ b=eZP1JkQgDptFQuiGYbsRXoiaTkHktMS93WpUERkmWJR2g4pcl0v+vxZMcSc56j9e7h\r
+ ja1WY9QqESAHjy1ipPb+cfCFM+QgubEB3p8S/55GWdPz/SEgKN06GTdrISKi895qOX5y\r
+ 6MaCk3KXRxhksWCiwRBdLA94QSFWRIQFJap4XlrbgGFzh/Fl+/rV5+n5bLchzXOFvtzL\r
+ WmpmNpLW0xGag0ADo9SfgcmY/OjZTqVBG37AK1a23ynQmCd1vZZ7CLDsYQRHyzQKXa7s\r
+ awAn2IP7oezOcuiS2fV0JMOTsk7f5h+Tv2+AZ0pJe5/aWIKmNcylUIJB9yc5I0eSXhOn\r
+ oY7Q==\r
+X-Received: by 10.180.92.98 with SMTP id cl2mr5088497wib.15.1377460545324;\r
+ Sun, 25 Aug 2013 12:55:45 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id\r
+ jc18sm13278986wic.5.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sun, 25 Aug 2013 12:55:44 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v4 2/3] contrib: pick: thread tagging (including archiving)\r
+ implemented\r
+Date: Sun, 25 Aug 2013 20:55:33 +0100\r
+Message-Id: <1377460534-6022-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1377460534-6022-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1377460534-6022-1-git-send-email-markwalters1009@gmail.com>\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: Mon, 26 Aug 2013 17:31:27 -0000\r
+\r
+Previously pick had no actions based on the entire thread: this adds\r
+some. Note in this version '*' is bound to `tag thread' which is not\r
+consistent with search or show. However it still might be the most\r
+natural thing (as it is similar to running * in the show pane).\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el | 27 +++++++++++++++++++++++++++\r
+ 1 files changed, 27 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index fea118f..258cfc3 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -246,6 +246,7 @@ FUNC."\r
+ ;; The main pick bindings\r
+ (define-key map "q" 'notmuch-pick-quit)\r
+ (define-key map "x" 'notmuch-pick-quit)\r
++ (define-key map "A" 'notmuch-pick-archive-thread)\r
+ (define-key map "a" 'notmuch-pick-archive-message-then-next)\r
+ (define-key map "=" 'notmuch-pick-refresh-view)\r
+ (define-key map "s" 'notmuch-pick-to-search)\r
+@@ -256,6 +257,7 @@ FUNC."\r
+ (define-key map "P" 'notmuch-pick-prev-message)\r
+ (define-key map "-" 'notmuch-pick-remove-tag)\r
+ (define-key map "+" 'notmuch-pick-add-tag)\r
++ (define-key map "*" 'notmuch-pick-tag-thread)\r
+ (define-key map " " 'notmuch-pick-scroll-or-next)\r
+ (define-key map "b" 'notmuch-pick-scroll-message-window-back)\r
+ map))\r
+@@ -620,6 +622,31 @@ message will be \"unarchived\", i.e. the tag changes in\r
+ (notmuch-pick-thread-mapcar 'notmuch-pick-get-message-id)\r
+ " or "))\r
+ \r
++(defun notmuch-pick-tag-thread (&optional tag-changes)\r
++ "Tag all messages in the current thread"\r
++ (interactive)\r
++ (when (notmuch-pick-get-message-properties)\r
++ (let ((tag-changes (notmuch-tag (notmuch-pick-get-messages-ids-thread-search) tag-changes)))\r
++ (notmuch-pick-thread-mapcar\r
++ (lambda () (notmuch-pick-tag-update-display tag-changes))))))\r
++\r
++(defun notmuch-pick-archive-thread (&optional unarchive)\r
++ "Archive each message in thread.\r
++\r
++Archive each message currently shown by applying the tag changes\r
++in `notmuch-archive-tags' to each. If a prefix argument is given,\r
++the messages will be \"unarchived\", i.e. the tag changes in\r
++`notmuch-archive-tags' will be reversed.\r
++\r
++Note: This command is safe from any race condition of new messages\r
++being delivered to the same thread. It does not archive the\r
++entire thread, but only the messages shown in the current\r
++buffer."\r
++ (interactive "P")\r
++ (when notmuch-archive-tags\r
++ (notmuch-pick-tag-thread\r
++ (notmuch-tag-change-list notmuch-archive-tags unarchive))))\r
++\r
+ ;; Functions below here display the pick buffer itself.\r
+ \r
+ (defun notmuch-pick-clean-address (address)\r
+-- \r
+1.7.9.1\r
+\r