Return-Path: <markwalters1009@gmail.com>
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 BD6C9429E5C
	for <notmuch@notmuchmail.org>; Sat,  1 Jun 2013 14:51:45 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0.201
X-Spam-Level: 
X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
	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 3+313OJms7+A for <notmuch@notmuchmail.org>;
	Sat,  1 Jun 2013 14:51:38 -0700 (PDT)
Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com
	[209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 16320431FDE
	for <notmuch@notmuchmail.org>; Sat,  1 Jun 2013 14:51:37 -0700 (PDT)
Received: by mail-wi0-f175.google.com with SMTP id hn14so1642378wib.2
	for <notmuch@notmuchmail.org>; Sat, 01 Jun 2013 14:51:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:x-mailer;
	bh=4JlKKlk1aeRVIL1hk/P9gVdlU/bEpJS5DNG6Cq3bN3Y=;
	b=uiys4QHOhEUMrzv4BM3r0wH3nJaT+W6Dvd6EIWQzLraUqzKcs9QgDlCNCd/jL9ksbc
	g7ZUAy+vwGcGLlW1bxeYRgNKvAIVUjGpSPuRWEcfrmcmJiYBnVGb3T12aXnLPxpapw9f
	5Q7NHOXllSFPPGGidSsWjW/dMRK8P9+gkqKtZvMdo21CpA999ZabwMG1xroQSSSe9gra
	NXN4Tn//LyeZsURB5xqFneoXzpqNi4YUgREcaTYhTtp/wi7h1No69xKytZE6QC50CFsG
	CxF/Nl/g7S+hdt+S8CJQRCCwPttP+FzUTM/kuQrQzXWD9sb9bYdnhUxnNlAlJ1uxKqcQ
	pvpw==
X-Received: by 10.194.110.169 with SMTP id ib9mr14114618wjb.12.1370123495723; 
	Sat, 01 Jun 2013 14:51:35 -0700 (PDT)
Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
	by mx.google.com with ESMTPSA id
	b11sm12885529wiv.10.2013.06.01.14.51.34 for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Sat, 01 Jun 2013 14:51:35 -0700 (PDT)
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH] contrib: pick: bugfix. use
	notmuch-show-only-matching-messages rather than prefix
Date: Sat,  1 Jun 2013 22:51:31 +0100
Message-Id: <1370123491-13902-1-git-send-email-markwalters1009@gmail.com>
X-Mailer: git-send-email 1.7.9.1
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Jun 2013 21:51:45 -0000

Previously pick set a prefix argument prior to calling show in the
message pane to tell show to only show matching messages. This sets
notmuch-show-only-matching-messages instead which is much cleaner and
will work even if the user has configured show to default to showing
only matching messages.
---
 contrib/notmuch-pick/notmuch-pick.el |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el
index 9079acf..2da43ea 100644
--- a/contrib/notmuch-pick/notmuch-pick.el
+++ b/contrib/notmuch-pick/notmuch-pick.el
@@ -376,8 +376,8 @@ Does NOT change the database."
 	    (split-window-vertically (/ (window-height) 4)))
       (with-selected-window notmuch-pick-message-window
 	;; Since we are only displaying one message do not indent.
-	(let ((notmuch-show-indent-messages-width 0))
-	  (setq current-prefix-arg '(4))
+	(let ((notmuch-show-indent-messages-width 0)
+	      (notmuch-show-only-matching-messages t))
 	  (setq buffer (notmuch-show id nil nil nil))))
       ;; We need the `let' as notmuch-pick-message-window is buffer local.
       (let ((window notmuch-pick-message-window))
-- 
1.7.9.1