[PATCH] contrib: pick: archive message updated

diff --git a/bf/930460c1f05d0cf6a4ecac229351bed89c0729 b/bf/930460c1f05d0cf6a4ecac229351bed89c0729
new file mode 100644 (file)
index 0000000..c116650
--- /dev/null
+++ b/bf/930460c1f05d0cf6a4ecac229351bed89c0729
@@ -0,0 +1,119 @@
+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 649DB431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 04:41:44 -0800 (PST)\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 Fp+KwV2WsymI for <notmuch@notmuchmail.org>;\r
+       Sat,  8 Dec 2012 04:41:44 -0800 (PST)\r
+Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com\r
+       [209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C07AC431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  8 Dec 2012 04:41:43 -0800 (PST)\r
+Received: by mail-wi0-f175.google.com with SMTP id hm11so189982wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 08 Dec 2012 04:41:42 -0800 (PST)\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:x-mailer;\r
+       bh=rxqrrypyOJaK5jqvzIsaaMIqLngIrTo3gr2sMXVaKao=;\r
+       b=xkhRMLL/jHUVGtpOO60zbaNfox64FUDmam5gBhaLg4TiCix22N4ZJQRq3OIGPBNiXc\r
+       UeHnYzQ9HbDEQ6y4OimsyhY+nHdy2J2O7Ngmj8TI9kbaTmyL0u/N/IBuYvFs6lYAv34n\r
+       +GyXRZhD/VQHJFI0WDMzor4s+Mv6qxYpdHbyyRVHfWyommXBg6v4G500rwZ42IQuy9qx\r
+       /r0/FIXuH25gw2lEgNXCZ4DwXHqaMyiYamzTD9vVZGTGWn9qdxIysBsd7IdUs+WhlhbU\r
+       FwVdRzJ4RED5ZUJSw+wfWD2JeF7WnidbUcn47aExpGn+lnqlqWLOmKTrkVJYDL7rWWO/\r
+       jtFQ==\r
+Received: by 10.216.220.35 with SMTP id n35mr3286540wep.128.1354970501178;\r
+       Sat, 08 Dec 2012 04:41:41 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPS id y3sm2032193wix.6.2012.12.08.04.41.39\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 08 Dec 2012 04:41:40 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: archive message updated\r
+Date: Sat,  8 Dec 2012 12:41:34 +0000\r
+Message-Id: <1354970494-18050-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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: Sat, 08 Dec 2012 12:41:44 -0000\r
+\r
+Update pick's archive message to respect notmuch-archive-tags. Also\r
+split archive message into an archiving part and a separate\r
+"then-next" part, to move more inline with show. Update the keybinding\r
+so default behaviour is unchanged.\r
+---\r
+\r
+Notmuch pick had fallen behind show so update.\r
+\r
+Best wishes \r
+\r
+Mark\r
+\r
+\r
+ contrib/notmuch-pick/notmuch-pick.el |   21 +++++++++++++++++----\r
+ 1 files changed, 17 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 755cbbc..36587a6 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -173,7 +173,7 @@\r
+     (define-key map "q" 'notmuch-pick-quit)\r
+     (define-key map "x" 'notmuch-pick-quit)\r
+     (define-key map "?" 'notmuch-help)\r
+-    (define-key map "a" 'notmuch-pick-archive-message)\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-search)\r
+     (define-key map "z" 'notmuch-pick)\r
+@@ -393,10 +393,23 @@ Does NOT change the database."\r
+       (kill-buffer notmuch-pick-message-buffer))\r
+     t))\r
+ \r
+-(defun notmuch-pick-archive-message ()\r
++(defun notmuch-pick-archive-message (&optional unarchive)\r
++  "Archive the current message.\r
++\r
++Archive the current message by applying the tag changes in\r
++`notmuch-archive-tags' to it (remove the \"inbox\" tag by\r
++default). If a prefix argument is given, the message will be\r
++\"unarchived\", i.e. the tag changes in `notmuch-archive-tags'\r
++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
++\r
++(defun notmuch-pick-archive-message-then-next (&optional unarchive)\r
+   "Archive the current message and move to next matching message."\r
+-  (interactive)\r
+-  (notmuch-pick-tag "-inbox")\r
++  (interactive "P")\r
++  (notmuch-pick-archive-message unarchive)\r
+   (notmuch-pick-next-matching-message))\r
+ \r
+ (defun notmuch-pick-next-message ()\r
+-- \r
+1.7.9.1\r
+\r