From c58d271d9f050a1227aec3b394f4271232cc9bf5 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sun, 3 Jun 2012 12:46:11 +0100 Subject: [PATCH] [Patch v7 5/6] emacs: make elide messages use notmuch-show for omitting messages. --- ed/1af6ce39615367ab0e9e506c1cf5436faa1b78 | 117 ++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 ed/1af6ce39615367ab0e9e506c1cf5436faa1b78 diff --git a/ed/1af6ce39615367ab0e9e506c1cf5436faa1b78 b/ed/1af6ce39615367ab0e9e506c1cf5436faa1b78 new file mode 100644 index 000000000..274d9a8ea --- /dev/null +++ b/ed/1af6ce39615367ab0e9e506c1cf5436faa1b78 @@ -0,0 +1,117 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 3FB2E431FBF + for ; Sun, 3 Jun 2012 04:46:30 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Or56GM9qlVDQ for ; + Sun, 3 Jun 2012 04:46:28 -0700 (PDT) +Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com + [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 887F5431FBD + for ; Sun, 3 Jun 2012 04:46:28 -0700 (PDT) +Received: by mail-wi0-f173.google.com with SMTP id hj6so1550539wib.2 + for ; Sun, 03 Jun 2012 04:46:28 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=q6At0WV4tzgoTgKbToXVTDKhW7cwIn5JuKJsn5MeByI=; + b=YmZFNeTrzr6m3ZDRlALzXB2CxfgLTQFAWy8kmoiAKfoeapELNbEZlbdGSbXkgq9jdm + Zv6pXdPGZegILVJ3IrlxSjT7SftgejENc717FGOTeJRI6JVikzJqeV6Oau8r2SNjT+38 + xEso6Ig9TA8v+weBnJ1l/lPmuqHfISOAMLNZVxDDtti4Gk5ozZLcKH0UloNgz8i95yVl + IWeJTrcVgYGfTkhwpm8hPqghAawJvSPaMBN4BsdMWOQAdy0ac6iz9yKCTV8fWWvo+8ci + HqGBN0m5Nl0MG+liOj6zr2LnMbbPfL8kP3Oz/OZTy304mUHZWs5wYf0xjUZZO/gCZ/Ib + /fKw== +Received: by 10.216.202.14 with SMTP id c14mr8339692weo.63.1338723988199; + Sun, 03 Jun 2012 04:46:28 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + q6sm12432354wiy.0.2012.06.03.04.46.26 (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 03 Jun 2012 04:46:27 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch v7 5/6] emacs: make elide messages use notmuch-show for + omitting messages. +Date: Sun, 3 Jun 2012 12:46:11 +0100 +Message-Id: <1338723972-13063-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com> +References: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 03 Jun 2012 11:46:30 -0000 + +Previously the elide messages code got the entire-thread from +notmuch-show.c and then threw away all non-matching messages. This +version calls notmuch-show.c without the --entire-thread flag so +it never receives the non-matching messages in the first place. + +This makes it substantially faster. +--- + emacs/notmuch-show.el | 18 ++++++++++-------- + 1 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index d318430..9cc68be 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -958,9 +958,9 @@ message at DEPTH in the current thread." + "Insert the message tree TREE at depth DEPTH in the current thread." + (let ((msg (car tree)) + (replies (cadr tree))) +- (if (or (not notmuch-show-elide-non-matching-messages) +- (plist-get msg :match)) +- (notmuch-show-insert-msg msg depth)) ++ ;; We test whether there is a message or just some replies. ++ (when msg ++ (notmuch-show-insert-msg msg depth)) + (notmuch-show-insert-thread replies (1+ depth)))) + + (defun notmuch-show-insert-thread (thread depth) +@@ -1041,16 +1041,18 @@ function is used." + (args (if notmuch-show-query-context + (append (list "\'") basic-args + (list "and (" notmuch-show-query-context ")\'")) +- (append (list "\'") basic-args (list "\'"))))) +- (notmuch-show-insert-forest (notmuch-query-get-threads +- (cons "--exclude=false" args))) ++ (append (list "\'") basic-args (list "\'")))) ++ (cli-args (cons "--exclude=false" ++ (when notmuch-show-elide-non-matching-messages ++ (list "--entire-thread=false"))))) ++ ++ (notmuch-show-insert-forest (notmuch-query-get-threads (append cli-args args))) + ;; If the query context reduced the results to nothing, run + ;; the basic query. + (when (and (eq (buffer-size) 0) + notmuch-show-query-context) + (notmuch-show-insert-forest +- (notmuch-query-get-threads +- (cons "--exclude=false" basic-args))))) ++ (notmuch-query-get-threads (append cli-args basic-args))))) + + (jit-lock-register #'notmuch-show-buttonise-links) + +-- +1.7.9.1 + -- 2.26.2