--- /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 5B796431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 3 Mar 2012 05:03:45 -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 hY+23c868SUK for <notmuch@notmuchmail.org>;\r
+ Sat, 3 Mar 2012 05:03:43 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+ [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 2C6E9431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 3 Mar 2012 05:03:43 -0800 (PST)\r
+Received: by wico1 with SMTP id o1so697694wic.26\r
+ for <notmuch@notmuchmail.org>; Sat, 03 Mar 2012 05:03:40 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+ 10.180.103.35 as permitted sender) client-ip=10.180.103.35; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+ markwalters1009@gmail.com designates 10.180.103.35 as permitted\r
+ sender) smtp.mail=markwalters1009@gmail.com;\r
+ dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.103.35])\r
+ by 10.180.103.35 with SMTP id ft3mr3896275wib.0.1330779820636 (num_hops\r
+ = 1); Sat, 03 Mar 2012 05:03:40 -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=XiM5XX4fQdyNVLdu+WTboRd5qKfrxG4JlPiD4PIxK5s=;\r
+ b=CWS5aayrPwv3tkukoq9fZPZI0NCiDCeH/IsRuKXBBYVE3M6C4+5myxYdUTM/I2u5Y4\r
+ iM3b2bv8+svxn/oARbJC5jrnVntK4mpxdVuQwrmCWmGbepIWHuvKttBq/5SGiHTqHbLg\r
+ rBIbzTkmHOGdjgTHhOqfvGVEI5zjBE5U/zX9gZNcCPzmW7E+5LZGAsMCK8n0pK/zr70L\r
+ BLVBEPge9YpgA3v8Vi/MqLbDuvQtSkF5zhj2qsIK851jc3rim8GCjuLOuOIZpMhHrL7+\r
+ XR7n4AhoLQUoHkdcNRoUGsk9UB7RVEyAGlkCPPFYu4fy0lgZAdGX57gdnnxtWt1S3EZR\r
+ BYfg==\r
+Received: by 10.180.103.35 with SMTP id ft3mr3075901wib.0.1330779820580;\r
+ Sat, 03 Mar 2012 05:03:40 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223]) by mx.google.com with ESMTPS id\r
+ fb2sm9380837wid.3.2012.03.03.05.03.39 (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 03 Mar 2012 05:03:39 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/5] Move to --with-excluded approach to excludes\r
+Date: Sat, 3 Mar 2012 13:05:13 +0000\r
+Message-Id: <1330779918-28024-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\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, 03 Mar 2012 13:03:45 -0000\r
+\r
+This series implements the proposal in id:"87y5riuz7v.fsf@qmul.ac.uk"\r
+to move to a consistent --with-excluded approach rather than the\r
+previous --no-exclude approach. See the message there and its\r
+descendants for discussion.\r
+\r
+The main user side change is that notmuch-search no longer defaults to\r
+showing all the excluded threads with [0/n] but will do so if the user\r
+says they want all the messages (i.e., by specifying --with-excluded).\r
+\r
+However, it makes everything consistent throughout the commandline and\r
+lib interfaces. In all cases a "message" type search only returns the\r
+non-excluded matches (unless --with-excluded is specified) and a\r
+"thread" type search returns all messages (including excluded ones) in\r
+threads that match in a non-excluded message.\r
+\r
+The patch series is bigger than I would like but it is relatively\r
+simple: the slightly tricky logic of the original series is\r
+untouched. This series just changes the names and defaults fed to the\r
+existing logic.\r
+\r
+The only slightly complicated part is the notmuch-show.c patch as it\r
+has to decide quite what to do in lots of cases. See\r
+id:"87d38t26wp.fsf@qmul.ac.uk" for reasons for the precise choices\r
+made.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+Mark Walters (5):\r
+ lib: rename (and negate) set_omit_excluded set_with_excluded\r
+ cli: move count to the new --with-excluded naming scheme.\r
+ cli: move search to the new --with-excluded naming scheme.\r
+ cli: move show to the new --with-excluded naming scheme.\r
+ emacs: make show set --with-excluded\r
+\r
+ emacs/notmuch-show.el | 6 ++++--\r
+ lib/notmuch.h | 12 +++++++-----\r
+ lib/query.cc | 10 +++++-----\r
+ man/man1/notmuch-count.1 | 4 ++--\r
+ man/man1/notmuch-search.1 | 6 ++++--\r
+ man/man1/notmuch-show.1 | 5 +++--\r
+ notmuch-client.h | 1 +\r
+ notmuch-count.c | 11 ++++++-----\r
+ notmuch-search.c | 20 +++++++++++---------\r
+ notmuch-show.c | 38 +++++++++++++++++++++-----------------\r
+ test/count | 4 ++--\r
+ test/search | 9 ++++-----\r
+ 12 files changed, 70 insertions(+), 56 deletions(-)\r
+\r
+-- \r
+1.7.2.3\r
+\r