[PATCH v2 01/11] contrib: pick: override notmuch-show-get-prop

diff --git a/f8/388c7ad4a9ff49237b6fa31e9abcaf8795cd61 b/f8/388c7ad4a9ff49237b6fa31e9abcaf8795cd61
new file mode 100644 (file)
index 0000000..79dd803
--- /dev/null
+++ b/f8/388c7ad4a9ff49237b6fa31e9abcaf8795cd61
@@ -0,0 +1,100 @@
+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 2BAB2421163\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:14:54 -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 ou5p4yOWf59o for <notmuch@notmuchmail.org>;\r
+       Sun, 18 Aug 2013 05:14:48 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+       [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id BB5E1431FD0\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:14:47 -0700 (PDT)\r
+Received: by mail-wi0-f169.google.com with SMTP id f14so2902213wiw.2\r
+       for <notmuch@notmuchmail.org>; Sun, 18 Aug 2013 05:14:45 -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=ER/JPS+bch1EHRerTB5t6hFWxmz5YcXbqvv8zEJwtLE=;\r
+       b=MyZclYq9JQ4+Ty/d1TjybZMWUy77HXOv6zjKvYaHUt7ByhRNICzrtSmTI23p1tXGR1\r
+       9x+yuVrHINUEJsjceGlN5IVDd+jnL/wPGHmiqmEl1V8TuVCiGnj8SQ3q0Uqs0RIZqW1y\r
+       80QurVANsR0Uc4A3WYS+nXgordAc79GIYWnb4BWjPmZxA9Lq/XBQQTRDZDCB39eslKlS\r
+       9z7XYtWSwRfl/Phhq+AWQx+l3GkPKcZwzswN8txU5Xa511EFAE3L60uD8US6V0dqlnEO\r
+       Trz3wNay8Sz9skaPXhwlRY0l/ai1XcK6BaC8pQETN9pVW1M8D4Pp/iHtU4FPaYwjmgxU\r
+       u5xw==\r
+X-Received: by 10.194.123.199 with SMTP id mc7mr107828wjb.43.1376828085185;\r
+       Sun, 18 Aug 2013 05:14: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 iz19sm9054786wic.9.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 18 Aug 2013 05:14:44 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 01/11] contrib: pick: override notmuch-show-get-prop\r
+Date: Sun, 18 Aug 2013 13:14:29 +0100\r
+Message-Id: <1376828079-21455-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1376828079-21455-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1376828079-21455-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: Sun, 18 Aug 2013 12:14:54 -0000\r
+\r
+We override notmuch-show-get-prop so that many of the show functions\r
+can be used in notmuch-pick without modification. The main use is that\r
+it means notmuch-show-get-message-id `works' in pick. Thus we get all\r
+the stash functions and several other `for free' in pick.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |   16 ++++++++++++++++\r
+ 1 files changed, 16 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 7f5f729..04e37ee 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -238,6 +238,22 @@ Some useful entries are:\r
+     (beginning-of-line)\r
+     (get-text-property (point) :notmuch-message-properties)))\r
+ \r
++;; XXX This should really be a lib function but we are trying to\r
++;; reduce impact on the code base.\r
++(defun notmuch-show-get-prop (prop &optional props)\r
++  "This is a pick overridden version of notmuch-show-get-prop\r
++\r
++It gets property PROP from PROPS or, if PROPS is nil, the current\r
++message in either pick or show. This means that several functions\r
++in notmuch-show now work unchanged in pick as they just need the\r
++correct message properties."\r
++  (let ((props (or props\r
++                 (cond ((eq major-mode 'notmuch-show-mode)\r
++                        (notmuch-show-get-message-properties))\r
++                       ((eq major-mode 'notmuch-pick-mode)\r
++                        (notmuch-pick-get-message-properties))))))\r
++    (plist-get props prop)))\r
++\r
+ (defun notmuch-pick-set-message-properties (props)\r
+   (save-excursion\r
+     (beginning-of-line)\r
+-- \r
+1.7.9.1\r
+\r