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

diff --git a/96/aa5f636c87d988ee9df39452bbe27a58b394a8 b/96/aa5f636c87d988ee9df39452bbe27a58b394a8
new file mode 100644 (file)
index 0000000..a22e86b
--- /dev/null
+++ b/96/aa5f636c87d988ee9df39452bbe27a58b394a8
@@ -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 7EE32431FD6\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 09:11:08 -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 7vbtHHLSfphC for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Apr 2012 09:11:07 -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
+ 3CDE3431E62   for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 09:11:06 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f45.google.com with SMTP id dt14so822285wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 07 Apr 2012 09:11:05 -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=Eu41iKn1e73ft0dy1L3xSVCj8GZkYLxtPvdmEuXueip/73kTWmmpwofi4JlCYZYVjv\r
+       9hTpDzfNw/io4l7zvY+rdgoLjPDYC2XT2utXv7PsE40kkzkX9WLIz227gyxPmcVbYNW3\r
+       jeelXnb42SAYXaxwhd96IhOLjirVHcG8S0mqSnfEJEWRq/59tCXvbPoxUKtnMAdyS3cp\r
+       KuHrsuiG0ygQsX/Rn8vuAVFwPuq06/6/RGyWA8LBzMthOU6i+mHyAxbxaHBXFW1sTCQx\r
+       ZUzh5x/3OEXK1HiZpROEdBArtNuX9LXUeNDBezAaLL3qP26gpT7NxLgj/6bvTdQFghUa\r
+       9UwA==\r
+Received: by 10.216.135.223 with SMTP id u73mr934631wei.117.1333815065801;\r
+       Sat, 07 Apr 2012 09:11:05 -0700 (PDT)\r
+Received: from localhost (94.197.17.51.threembb.co.uk. [94.197.17.51])\r
+       by mx.google.com with ESMTPS id k6sm15637159wiy.7.2012.04.07.09.11.03\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 07 Apr 2012 09:11:04 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 6/6] emacs: make show set --exclude=false\r
+Date: Sat,  7 Apr 2012 17:10:08 +0100\r
+Message-Id: <1333815008-24668-7-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333815008-24668-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1333815008-24668-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, 07 Apr 2012 16:11:09 -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