From: Mark Walters Date: Sat, 7 Apr 2012 16:10:08 +0000 (+0100) Subject: [PATCH v4 6/6] emacs: make show set --exclude=false X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=33ecd7828d4400dbfd8a0629b42725af8f7508ef;p=notmuch-archives.git [PATCH v4 6/6] emacs: make show set --exclude=false --- diff --git a/96/aa5f636c87d988ee9df39452bbe27a58b394a8 b/96/aa5f636c87d988ee9df39452bbe27a58b394a8 new file mode 100644 index 000000000..a22e86b48 --- /dev/null +++ b/96/aa5f636c87d988ee9df39452bbe27a58b394a8 @@ -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 7EE32431FD6 + for ; Sat, 7 Apr 2012 09:11:08 -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 7vbtHHLSfphC for ; + Sat, 7 Apr 2012 09:11:07 -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 + 3CDE3431E62 for ; Sat, 7 Apr 2012 09:11:06 -0700 + (PDT) +Received: by mail-wg0-f45.google.com with SMTP id dt14so822285wgb.2 + for ; Sat, 07 Apr 2012 09:11:05 -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=Eu41iKn1e73ft0dy1L3xSVCj8GZkYLxtPvdmEuXueip/73kTWmmpwofi4JlCYZYVjv + 9hTpDzfNw/io4l7zvY+rdgoLjPDYC2XT2utXv7PsE40kkzkX9WLIz227gyxPmcVbYNW3 + jeelXnb42SAYXaxwhd96IhOLjirVHcG8S0mqSnfEJEWRq/59tCXvbPoxUKtnMAdyS3cp + KuHrsuiG0ygQsX/Rn8vuAVFwPuq06/6/RGyWA8LBzMthOU6i+mHyAxbxaHBXFW1sTCQx + ZUzh5x/3OEXK1HiZpROEdBArtNuX9LXUeNDBezAaLL3qP26gpT7NxLgj/6bvTdQFghUa + 9UwA== +Received: by 10.216.135.223 with SMTP id u73mr934631wei.117.1333815065801; + Sat, 07 Apr 2012 09:11:05 -0700 (PDT) +Received: from localhost (94.197.17.51.threembb.co.uk. [94.197.17.51]) + by mx.google.com with ESMTPS id k6sm15637159wiy.7.2012.04.07.09.11.03 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 07 Apr 2012 09:11:04 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v4 6/6] emacs: make show set --exclude=false +Date: Sat, 7 Apr 2012 17:10:08 +0100 +Message-Id: <1333815008-24668-7-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1333815008-24668-1-git-send-email-markwalters1009@gmail.com> +References: <1333815008-24668-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, 07 Apr 2012 16:11:09 -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 +