[PATCH 5/5] emacs: make show set --with-excluded

diff --git a/22/52d1387d9e82ddbd67a90bfc9ca8e5fc2c3169 b/22/52d1387d9e82ddbd67a90bfc9ca8e5fc2c3169
new file mode 100644 (file)
index 0000000..9ad0b0c
--- /dev/null
+++ b/22/52d1387d9e82ddbd67a90bfc9ca8e5fc2c3169
@@ -0,0 +1,103 @@
+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 B9F02431E82\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 05:04:22 -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 BEN2gCgwtjk9 for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Mar 2012 05:04:21 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-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
+ 907C9431FC4   for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 05:04:21 -0800\r
+ (PST)\r
+Received: by mail-ww0-f45.google.com with SMTP id ds10so171103wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 03 Mar 2012 05:04:21 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.95.105 as permitted sender) client-ip=10.180.95.105; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.95.105 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.95.105])\r
+       by 10.180.95.105 with SMTP id dj9mr3813400wib.18.1330779861364\r
+       (num_hops = 1); Sat, 03 Mar 2012 05:04:21 -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:in-reply-to:references;\r
+       bh=XvqlUFHU0fclHJXyE5g9qO+KMiD3k7R31rRPAGgSZMc=;\r
+       b=cONAcpvf5ptwZKjTXcD7nIOa+Oc243uSNDfYpUn7MGHO2nv8xHopYeEXUlnWTUKtEJ\r
+       A2Z8SjsPGb0lT7r0g0pIZGFOI3/QnqQLp6Pp6WlHg9rjkSUjajV+jIOO8I/qABE1TLI7\r
+       HlrrmOPcf3wcYuP82VAO66QLuzMTQt6CsdiiU6eKLv+UKjhq9nEDf0uyJ4TR3qgt++/E\r
+       k4SwkpM3nHUaRKO0atUf0DB+PJzplu+WjGj2tFrDKHRAN9qcI3g++fEe3dChuzeqBVhw\r
+       GHm2cEulYzOcrViL2yUpAqiye8oprpQZzAu3C/87ZaXfQHaaj0PsVyWRA1WrJwVc5g0z\r
+       /KAg==\r
+Received: by 10.180.95.105 with SMTP id dj9mr3011015wib.18.1330779861209;\r
+       Sat, 03 Mar 2012 05:04:21 -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
+ gp8sm9374568wib.5.2012.03.03.05.04.19 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 03 Mar 2012 05:04:20 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/5] emacs: make show set --with-excluded\r
+Date: Sat,  3 Mar 2012 13:05:18 +0000\r
+Message-Id: <1330779918-28024-6-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330779918-28024-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330779918-28024-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, 03 Mar 2012 13:04:23 -0000\r
+\r
+Show has to set --with-excluded to deal with cases where it is asked\r
+to show a single excluded message. It use 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 4a60631..39c5713 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1099,13 +1099,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
++                                   (append (list "--with-excluded") 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
++          (append (list "--with-excluded") basic-args)))))\r
+ \r
+       (jit-lock-register #'notmuch-show-buttonise-links)\r
+ \r
+-- \r
+1.7.2.3\r
+\r