[Patch v7 5/6] emacs: make elide messages use notmuch-show for omitting messages.

diff --git a/ed/1af6ce39615367ab0e9e506c1cf5436faa1b78 b/ed/1af6ce39615367ab0e9e506c1cf5436faa1b78
new file mode 100644 (file)
index 0000000..274d9a8
--- /dev/null
+++ b/ed/1af6ce39615367ab0e9e506c1cf5436faa1b78
@@ -0,0 +1,117 @@
+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 3FB2E431FBF\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:30 -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 Or56GM9qlVDQ for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Jun 2012 04:46:28 -0700 (PDT)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+       [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 887F5431FBD\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:28 -0700 (PDT)\r
+Received: by mail-wi0-f173.google.com with SMTP id hj6so1550539wib.2\r
+       for <notmuch@notmuchmail.org>; Sun, 03 Jun 2012 04:46:28 -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=q6At0WV4tzgoTgKbToXVTDKhW7cwIn5JuKJsn5MeByI=;\r
+       b=YmZFNeTrzr6m3ZDRlALzXB2CxfgLTQFAWy8kmoiAKfoeapELNbEZlbdGSbXkgq9jdm\r
+       Zv6pXdPGZegILVJ3IrlxSjT7SftgejENc717FGOTeJRI6JVikzJqeV6Oau8r2SNjT+38\r
+       xEso6Ig9TA8v+weBnJ1l/lPmuqHfISOAMLNZVxDDtti4Gk5ozZLcKH0UloNgz8i95yVl\r
+       IWeJTrcVgYGfTkhwpm8hPqghAawJvSPaMBN4BsdMWOQAdy0ac6iz9yKCTV8fWWvo+8ci\r
+       HqGBN0m5Nl0MG+liOj6zr2LnMbbPfL8kP3Oz/OZTy304mUHZWs5wYf0xjUZZO/gCZ/Ib\r
+       /fKw==\r
+Received: by 10.216.202.14 with SMTP id c14mr8339692weo.63.1338723988199;\r
+       Sun, 03 Jun 2012 04:46:28 -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
+ q6sm12432354wiy.0.2012.06.03.04.46.26 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 03 Jun 2012 04:46:27 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 5/6] emacs: make elide messages use notmuch-show for\r
+       omitting messages.\r
+Date: Sun,  3 Jun 2012 12:46:11 +0100\r
+Message-Id: <1338723972-13063-6-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1338723972-13063-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: Sun, 03 Jun 2012 11:46:30 -0000\r
+\r
+Previously the elide messages code got the entire-thread from\r
+notmuch-show.c and then threw away all non-matching messages. This\r
+version calls notmuch-show.c without the --entire-thread flag so\r
+it never receives the non-matching messages in the first place.\r
+\r
+This makes it substantially faster.\r
+---\r
+ emacs/notmuch-show.el |   18 ++++++++++--------\r
+ 1 files changed, 10 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index d318430..9cc68be 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -958,9 +958,9 @@ message at DEPTH in the current thread."\r
+   "Insert the message tree TREE at depth DEPTH in the current thread."\r
+   (let ((msg (car tree))\r
+       (replies (cadr tree)))\r
+-    (if (or (not notmuch-show-elide-non-matching-messages)\r
+-          (plist-get msg :match))\r
+-      (notmuch-show-insert-msg msg depth))\r
++    ;; We test whether there is a message or just some replies.\r
++    (when msg\r
++      (notmuch-show-insert-msg msg depth))\r
+     (notmuch-show-insert-thread replies (1+ depth))))\r
+ \r
+ (defun notmuch-show-insert-thread (thread depth)\r
+@@ -1041,16 +1041,18 @@ function is used."\r
+            (args (if notmuch-show-query-context\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\r
+-                                   (cons "--exclude=false" args)))\r
++                   (append (list "\'") basic-args (list "\'"))))\r
++           (cli-args (cons "--exclude=false"\r
++                           (when notmuch-show-elide-non-matching-messages\r
++                             (list "--entire-thread=false")))))\r
++\r
++      (notmuch-show-insert-forest (notmuch-query-get-threads (append cli-args 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\r
+-          (cons "--exclude=false" basic-args)))))\r
++         (notmuch-query-get-threads (append cli-args basic-args)))))\r
+ \r
+       (jit-lock-register #'notmuch-show-buttonise-links)\r
+ \r
+-- \r
+1.7.9.1\r
+\r