[PATCH v2 6/6] emacs: make show set --exclude=false

diff --git a/f8/3de7f7b8a37e48c9c334ca4f5aff15cf6f7179 b/f8/3de7f7b8a37e48c9c334ca4f5aff15cf6f7179
new file mode 100644 (file)
index 0000000..59b0937
--- /dev/null
+++ b/f8/3de7f7b8a37e48c9c334ca4f5aff15cf6f7179
@@ -0,0 +1,94 @@
+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 33A1D421177\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:54:23 -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 7Al5L3caVU09 for <notmuch@notmuchmail.org>;\r
+       Sat, 31 Mar 2012 15:54:22 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2555242116A\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:54:22 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hn6so1346075wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 31 Mar 2012 15:54:21 -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:in-reply-to:references;\r
+       bh=6AWDtpv50jmIDDNcYOwlTA9e7zH4EvWg3JLHKf43KCI=;\r
+       b=sEHKuAh2OBMqS6v3b3y26coJDn078Isk/JBBFtWpfAb039GKZqlNoWeYqDqchwwdY8\r
+       aUCjJfB9I+HarA22cSCA13c1FPWGls3g5GiGfA24aI6Yh0gD+qNNtvSNU4tHnl9gLX6f\r
+       +AAn+PnVsrqkIaaDfYhIeJq9ez9u43hHtV+opfxZBuq3kOo0RM14ffXoDnPlEx9VPlrh\r
+       krGZEacmsuu+wm+z285SNXy3kQWTGRfCdFaMn0cVcP8yjfsQdw5GRn/zNp7nbSQu7NW5\r
+       4276V8Fc2jx9HqchFu5bk93L5yMpQmRhygX6G2KjdyhjToZdhHB7QfE4fJvYXvjON9IV\r
+       ao7w==\r
+Received: by 10.180.101.136 with SMTP id fg8mr10630173wib.4.1333234461800;\r
+       Sat, 31 Mar 2012 15:54:21 -0700 (PDT)\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
+ n20sm31850426wiw.5.2012.03.31.15.54.20        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 31 Mar 2012 15:54:21 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 6/6] emacs: make show set --exclude=false\r
+Date: Sat, 31 Mar 2012 23:54:02 +0100\r
+Message-Id: <1333234442-28616-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333234442-28616-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1333234442-28616-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: Sat, 31 Mar 2012 22:54:23 -0000\r
+\r
+Show has to set --exclude=false to deal with cases where it is asked\r
+to show a single excluded message. It uses JSON so it can easily pass\r
+the exclude information to the user.\r
+---\r
+ emacs/notmuch-show.el |    6 ++++--\r
+ 1 files changed, 4 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 6d3fe62..30b26d1 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1060,13 +1060,15 @@ function is used."\r
+                      (append (list "\'") basic-args\r
+                              (list "and (" notmuch-show-query-context ")\'"))\r
+                    (append (list "\'") basic-args (list "\'")))))\r
+-      (notmuch-show-insert-forest (notmuch-query-get-threads args))\r
++      (notmuch-show-insert-forest (notmuch-query-get-threads\r
++                                   (cons "--exclude=false" args)))\r
+       ;; If the query context reduced the results to nothing, run\r
+       ;; the basic query.\r
+       (when (and (eq (buffer-size) 0)\r
+                  notmuch-show-query-context)\r
+         (notmuch-show-insert-forest\r
+-         (notmuch-query-get-threads basic-args))))\r
++         (notmuch-query-get-threads\r
++          (cons "--exclude=false" basic-args)))))\r
+ \r
+       (jit-lock-register #'notmuch-show-buttonise-links)\r
+ \r
+-- \r
+1.7.9.1\r
+\r