From: Mark Walters Date: Tue, 10 Apr 2012 17:04:56 +0000 (+0100) Subject: [PATCH 2/2] emacs: make elide messages use notmuch-show for omitting messages. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2ce83e0e749eb660d45170ee3031babfb724b912;p=notmuch-archives.git [PATCH 2/2] emacs: make elide messages use notmuch-show for omitting messages. --- diff --git a/79/207e6b132982331cd9026fb2643055f2653a72 b/79/207e6b132982331cd9026fb2643055f2653a72 new file mode 100644 index 000000000..417539f77 --- /dev/null +++ b/79/207e6b132982331cd9026fb2643055f2653a72 @@ -0,0 +1,116 @@ +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 E16FE431FCB + for ; Tue, 10 Apr 2012 10:05:04 -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 BjwdhwE09Mow for ; + Tue, 10 Apr 2012 10:05:03 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 3978B431FAF + for ; Tue, 10 Apr 2012 10:05:00 -0700 (PDT) +Received: by werm13 with SMTP id m13so11552wer.26 + for ; Tue, 10 Apr 2012 10:04:59 -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=1vD5CbpJz/kS/rYrsYRBdou0fmSbaIfu5k/kPlvBdDg=; + b=JD3PTVR1tuezlaAi2YT/l+QQGnNbCmxEmk072HquzdL4BvsDCCYWf7Ce09vAV1k8NL + rNVvODUX1DET4LMPfkKxVWl7WcM5TpKnFzKahGl9rlvBdMqP8qLrpXnwzCh9L+dSZxTX + mvIARMy81SLCmxSdOSITmCDwVaglntRaKqlWJBzjAzZDOQOnCkwueyQ9uKWn1/fRa6SS + BPYtgbw48BJ+8VIwqrJfNwlVJ4K7bHcjgh855UsDwYjK0txnoao8rlvYEs6TtN8gnapd + /QX9BobMZde8sAJJ18TS5Tz/0XUY2kAp8pTUQhMn4SDquErJinDu67Knhv6O8P6I2vNa + lrcQ== +Received: by 10.216.135.225 with SMTP id u75mr6301646wei.97.1334077498897; + Tue, 10 Apr 2012 10:04:58 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + 6sm38833447wiz.1.2012.04.10.10.04.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, + 10 Apr 2012 10:04:58 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] emacs: make elide messages use notmuch-show for omitting + messages. +Date: Tue, 10 Apr 2012 18:04:56 +0100 +Message-Id: <1334077496-9172-3-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1334077496-9172-1-git-send-email-markwalters1009@gmail.com> +References: <1334077496-9172-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, 10 Apr 2012 17:05:05 -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 | 17 +++++++++-------- + 1 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 30b26d1..31e6937 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,17 @@ 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 (when notmuch-show-elide-non-matching-messages ++ (list "--entire-thread=false" "--exclude=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 +