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

diff --git a/fc/387f9a2543f26965c57bf8a470121116a7218f b/fc/387f9a2543f26965c57bf8a470121116a7218f
new file mode 100644 (file)
index 0000000..9fd8d44
--- /dev/null
+++ b/fc/387f9a2543f26965c57bf8a470121116a7218f
@@ -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 207A0431FD6\r
+       for <notmuch@notmuchmail.org>; Fri,  6 Apr 2012 05:49:29 -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 D617iMwUHYnX for <notmuch@notmuchmail.org>;\r
+       Fri,  6 Apr 2012 05:49:28 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 57DB1431FDC   for <notmuch@notmuchmail.org>; Fri,  6 Apr 2012 05:49:26 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f45.google.com with SMTP id dt14so188823wgb.2\r
+       for <notmuch@notmuchmail.org>; Fri, 06 Apr 2012 05:49:26 -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=YDsqjG1XQhu+XGTBz7XO3bwBFH5gV7uke5FXRAN74772jpNHXV+z3bzmrKQYxE2nfD\r
+       7ZlAi7nhoiK2UVBYPxVhd2ad/YEn1mk/SDOGDv04DS1nCyKnbVzczgjWrFyJ17BPT6bS\r
+       VVEpqVsWF7afWoGL5etbyh/OVfg+jppT3YU03lE/nnqqyp4WYC2C7ZR15VJuy7pL9sat\r
+       x4drGefCVHr30ugezz18ZbSkg1hdZuvpxQj7IUUkIseYW8keG49S7TjPteYMdBOdf1fE\r
+       Z9Zh4QuAg/84JN/vHKyQxso9UJrm/buITNtLULSODXWXi54XJlvYQdDNRYeT1MtYSraX\r
+       Quog==\r
+Received: by 10.180.102.129 with SMTP id fo1mr11701605wib.6.1333716566014;\r
+       Fri, 06 Apr 2012 05:49:26 -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
+ fn2sm10219101wib.0.2012.04.06.05.49.24        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 06 Apr 2012 05:49:25 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 6/6] emacs: make show set --exclude=false\r
+Date: Fri,  6 Apr 2012 13:49:11 +0100\r
+Message-Id: <1333716551-29153-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333716551-29153-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1333716551-29153-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: Fri, 06 Apr 2012 12:49:29 -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