From: Mark Walters Date: Tue, 24 Apr 2012 09:11:15 +0000 (+0100) Subject: [PATCH v4 4/4] emacs: make elide messages use notmuch-show for omitting messages. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e6c42226d7b580d14b3cc441b2cabad34599177b;p=notmuch-archives.git [PATCH v4 4/4] emacs: make elide messages use notmuch-show for omitting messages. --- diff --git a/35/b50809ef6bfe43d7072e5fd6d70b1d27b856dc b/35/b50809ef6bfe43d7072e5fd6d70b1d27b856dc new file mode 100644 index 000000000..02b14f867 --- /dev/null +++ b/35/b50809ef6bfe43d7072e5fd6d70b1d27b856dc @@ -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 19C86431FBC + for ; Tue, 24 Apr 2012 02:11:24 -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 FeTGoVQHVnrq for ; + Tue, 24 Apr 2012 02:11:22 -0700 (PDT) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 42223431FC3 for ; Tue, 24 Apr 2012 02:11:19 -0700 + (PDT) +Received: by mail-wg0-f45.google.com with SMTP id dt14so309405wgb.2 + for ; Tue, 24 Apr 2012 02:11:19 -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=aasTrjmSImxmkYhyseG2hyVpp6vgyQIgMHe9SSkVsvI=; + b=oFyCaQ74rQa/2BgArgCUqwsrZ6aXg5289VZ1ky55J3xyCxwt3C5BpTD9I45gcHW8DW + 5JBOPzYYeywLbWlNfoiCdeOJI1mqUw7ZMXfpn3RUt6gzyCu44KW5PAmlNAxVhM3XLOgH + dK/lzrGhVFaqx/wAzzHOzh2o2reisyjlktx/WcxQ0Qoompmg1+l+2G4jKNd7QLBAlwV3 + upjUImedLWZOPErCZZDEnO2Uml/IVpMod8LpaIib3hJtM89x9jdHp2JY881721Mwl3eV + K2zQkst+9Ovd0QZKUGLnP8LQq9srPYVKBuSeNzAi0qElS0T2y6SjYTrcfiAaV3L4hW8J + Xk0w== +Received: by 10.180.93.196 with SMTP id cw4mr29297595wib.19.1335258678332; + Tue, 24 Apr 2012 02:11:18 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + k6sm28691614wiy.7.2012.04.24.02.11.16 (version=TLSv1/SSLv3 cipher=OTHER); + Tue, 24 Apr 2012 02:11:16 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 4/4] emacs: make elide messages use notmuch-show for + omitting messages. +Date: Tue, 24 Apr 2012 10:11:15 +0100 +Message-Id: <1335258675-29439-5-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1335258675-29439-1-git-send-email-markwalters1009@gmail.com> +References: <1335258675-29439-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: Tue, 24 Apr 2012 09:11:24 -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 4ee4290..347f90c 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -976,9 +976,9 @@ current buffer, if possible." + "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) +@@ -1059,16 +1059,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 +