From: Mark Walters Date: Sat, 31 Mar 2012 22:54:02 +0000 (+0100) Subject: [PATCH v2 6/6] emacs: make show set --exclude=false X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c1764f2e1f8e5bfb587adf3d9ca87a9066a3fb3c;p=notmuch-archives.git [PATCH v2 6/6] emacs: make show set --exclude=false --- diff --git a/f8/3de7f7b8a37e48c9c334ca4f5aff15cf6f7179 b/f8/3de7f7b8a37e48c9c334ca4f5aff15cf6f7179 new file mode 100644 index 000000000..59b093768 --- /dev/null +++ b/f8/3de7f7b8a37e48c9c334ca4f5aff15cf6f7179 @@ -0,0 +1,94 @@ +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 33A1D421177 + for ; Sat, 31 Mar 2012 15:54:23 -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 7Al5L3caVU09 for ; + Sat, 31 Mar 2012 15:54:22 -0700 (PDT) +Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com + [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 2555242116A + for ; Sat, 31 Mar 2012 15:54:22 -0700 (PDT) +Received: by mail-wi0-f179.google.com with SMTP id hn6so1346075wib.2 + for ; Sat, 31 Mar 2012 15:54:21 -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=6AWDtpv50jmIDDNcYOwlTA9e7zH4EvWg3JLHKf43KCI=; + b=sEHKuAh2OBMqS6v3b3y26coJDn078Isk/JBBFtWpfAb039GKZqlNoWeYqDqchwwdY8 + aUCjJfB9I+HarA22cSCA13c1FPWGls3g5GiGfA24aI6Yh0gD+qNNtvSNU4tHnl9gLX6f + +AAn+PnVsrqkIaaDfYhIeJq9ez9u43hHtV+opfxZBuq3kOo0RM14ffXoDnPlEx9VPlrh + krGZEacmsuu+wm+z285SNXy3kQWTGRfCdFaMn0cVcP8yjfsQdw5GRn/zNp7nbSQu7NW5 + 4276V8Fc2jx9HqchFu5bk93L5yMpQmRhygX6G2KjdyhjToZdhHB7QfE4fJvYXvjON9IV + ao7w== +Received: by 10.180.101.136 with SMTP id fg8mr10630173wib.4.1333234461800; + Sat, 31 Mar 2012 15:54:21 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + n20sm31850426wiw.5.2012.03.31.15.54.20 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 31 Mar 2012 15:54:21 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2 6/6] emacs: make show set --exclude=false +Date: Sat, 31 Mar 2012 23:54:02 +0100 +Message-Id: <1333234442-28616-7-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1333234442-28616-1-git-send-email-markwalters1009@gmail.com> +References: <1333234442-28616-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, 31 Mar 2012 22:54:23 -0000 + +Show has to set --exclude=false to deal with cases where it is asked +to show a single excluded message. It uses JSON so it can easily pass +the exclude information to the user. +--- + emacs/notmuch-show.el | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 6d3fe62..30b26d1 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1060,13 +1060,15 @@ function is used." + (append (list "\'") basic-args + (list "and (" notmuch-show-query-context ")\'")) + (append (list "\'") basic-args (list "\'"))))) +- (notmuch-show-insert-forest (notmuch-query-get-threads args)) ++ (notmuch-show-insert-forest (notmuch-query-get-threads ++ (cons "--exclude=false" 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 basic-args)))) ++ (notmuch-query-get-threads ++ (cons "--exclude=false" basic-args))))) + + (jit-lock-register #'notmuch-show-buttonise-links) + +-- +1.7.9.1 +