[PATCH] contrib: pick: bugfix. use notmuch-show-only-matching-messages rather than...

diff --git a/28/0e42a2566c2f9ffe04d2f47acd2cea5b3a1bf4 b/28/0e42a2566c2f9ffe04d2f47acd2cea5b3a1bf4
new file mode 100644 (file)
index 0000000..176d4fb
--- /dev/null
+++ b/28/0e42a2566c2f9ffe04d2f47acd2cea5b3a1bf4
@@ -0,0 +1,89 @@
+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 BD6C9429E5C\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Jun 2013 14:51:45 -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 3+313OJms7+A for <notmuch@notmuchmail.org>;\r
+       Sat,  1 Jun 2013 14:51:38 -0700 (PDT)\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 16320431FDE\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Jun 2013 14:51:37 -0700 (PDT)\r
+Received: by mail-wi0-f175.google.com with SMTP id hn14so1642378wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 01 Jun 2013 14:51:35 -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:x-mailer;\r
+       bh=4JlKKlk1aeRVIL1hk/P9gVdlU/bEpJS5DNG6Cq3bN3Y=;\r
+       b=uiys4QHOhEUMrzv4BM3r0wH3nJaT+W6Dvd6EIWQzLraUqzKcs9QgDlCNCd/jL9ksbc\r
+       g7ZUAy+vwGcGLlW1bxeYRgNKvAIVUjGpSPuRWEcfrmcmJiYBnVGb3T12aXnLPxpapw9f\r
+       5Q7NHOXllSFPPGGidSsWjW/dMRK8P9+gkqKtZvMdo21CpA999ZabwMG1xroQSSSe9gra\r
+       NXN4Tn//LyeZsURB5xqFneoXzpqNi4YUgREcaTYhTtp/wi7h1No69xKytZE6QC50CFsG\r
+       CxF/Nl/g7S+hdt+S8CJQRCCwPttP+FzUTM/kuQrQzXWD9sb9bYdnhUxnNlAlJ1uxKqcQ\r
+       pvpw==\r
+X-Received: by 10.194.110.169 with SMTP id ib9mr14114618wjb.12.1370123495723; \r
+       Sat, 01 Jun 2013 14:51:35 -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
+       b11sm12885529wiv.10.2013.06.01.14.51.34 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 01 Jun 2013 14:51:35 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: bugfix. use\r
+       notmuch-show-only-matching-messages rather than prefix\r
+Date: Sat,  1 Jun 2013 22:51:31 +0100\r
+Message-Id: <1370123491-13902-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, 01 Jun 2013 21:51:45 -0000\r
+\r
+Previously pick set a prefix argument prior to calling show in the\r
+message pane to tell show to only show matching messages. This sets\r
+notmuch-show-only-matching-messages instead which is much cleaner and\r
+will work even if the user has configured show to default to showing\r
+only matching messages.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 9079acf..2da43ea 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -376,8 +376,8 @@ Does NOT change the database."\r
+           (split-window-vertically (/ (window-height) 4)))\r
+       (with-selected-window notmuch-pick-message-window\r
+       ;; Since we are only displaying one message do not indent.\r
+-      (let ((notmuch-show-indent-messages-width 0))\r
+-        (setq current-prefix-arg '(4))\r
++      (let ((notmuch-show-indent-messages-width 0)\r
++            (notmuch-show-only-matching-messages t))\r
+         (setq buffer (notmuch-show id nil nil nil))))\r
+       ;; We need the `let' as notmuch-pick-message-window is buffer local.\r
+       (let ((window notmuch-pick-message-window))\r
+-- \r
+1.7.9.1\r
+\r