From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 2492F431FBC for ; Sat, 21 Apr 2012 02:15:52 -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 wiDy3sHd3UIP for ; Sat, 21 Apr 2012 02:15:51 -0700 (PDT) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 798A7431FB6 for ; Sat, 21 Apr 2012 02:15:51 -0700 (PDT) Received: by mail-wi0-f169.google.com with SMTP id hm17so1500624wib.2 for ; Sat, 21 Apr 2012 02:15:51 -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=GjH0S6EySk8kvSohvPjU/zAcHBf4GZNIQ2N1h8uvZVBMINnVd186FFtuxydnaiSxdo eCXyQum3BqvT0vqwDlzXhqbwUDBf0+9RPYzYQGk7Idakkx0tXwOarvuxEN37zms128oF nFq1JfsAX2bsJVew042sqYRjtgBuvaCFjwNEwV5SIm/flJtEGxI0Nf2bHPVrgeGCq9o6 kjQTwgUfk3InIeWUgxsJEJbLzXKQzt7wrUbROn68vaM/AVAj/L9nWRDiXx0TPak/kTQ1 doxQ1HB3x/t3v73kjHHHiNZ1mOYkDf1h3VjSyukVp/7+NdR3qgkI73FxHBK6AmxGtlXD NEOA== Received: by 10.180.94.33 with SMTP id cz1mr4754259wib.13.1334999751098; Sat, 21 Apr 2012 02:15:51 -0700 (PDT) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id n8sm6654382wix.10.2012.04.21.02.15.50 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 21 Apr 2012 02:15:50 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v3 2/2] emacs: make elide messages use notmuch-show for omitting messages. Date: Sat, 21 Apr 2012 10:15:50 +0100 Message-Id: <1334999750-21811-3-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334999750-21811-1-git-send-email-markwalters1009@gmail.com> References: <1334999750-21811-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: Sat, 21 Apr 2012 09:15:52 -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