From: Mark Walters Date: Thu, 15 Mar 2012 18:42:05 +0000 (+0000) Subject: [PATCH 5/5] emacs: make show set --exclude=flag X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0fe2fe0931fd4e191b8289f24636301f008a0acd;p=notmuch-archives.git [PATCH 5/5] emacs: make show set --exclude=flag --- diff --git a/ff/6593fa4de8a11084814adff22c173a9046dee5 b/ff/6593fa4de8a11084814adff22c173a9046dee5 new file mode 100644 index 000000000..10930f77a --- /dev/null +++ b/ff/6593fa4de8a11084814adff22c173a9046dee5 @@ -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 10C39431E64 + for ; Thu, 15 Mar 2012 11:42:42 -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 zYWy9hzCpprX for ; + Thu, 15 Mar 2012 11:42:41 -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 A606C429E35 + for ; Thu, 15 Mar 2012 11:42:26 -0700 (PDT) +Received: by mail-we0-f181.google.com with SMTP id m13so3528469wer.26 + for ; Thu, 15 Mar 2012 11:42:26 -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=LB6yTV8BSzYPH/pQlFIb8n78YiXkbCdRmetlHa021oc=; + b=DIAptrWezKZtOlFeaCggQpxFeQmeRnCRs8IeWHGaG5JSbG9kfcsArm67b4aL7eBrg6 + GBfs1GHWIkexvXCjnQxxGewvER87u04rEHC36C8FmEiUV8fMm6Rwl/GeQj8Ra+BodW9v + 08+RZZ7DppzD12L4zW3sr32jCl6hUUg4pDrpH+B6DIitsVkPMXfFrBHUg8s+GmD0pxsM + bjmSofFrPV9KIE4rS4RagRVk0zv9m+VjQYoY2lQiPhf4bUf7RFr1fc+t+wWudlDjjR6J + bp/Ogf/ldKug3S5FyBwHEnfkSzpD10aGYWBKK9k5DzkIO889wsMY0y4PuhE1EEuNs3tW + Qemw== +Received: by 10.180.102.129 with SMTP id fo1mr18106913wib.6.1331836946307; + Thu, 15 Mar 2012 11:42:26 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + df3sm7082322wib.1.2012.03.15.11.42.24 (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 15 Mar 2012 11:42:25 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 5/5] emacs: make show set --exclude=flag +Date: Thu, 15 Mar 2012 18:42:05 +0000 +Message-Id: <1331836925-31437-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com> +References: <1331836925-31437-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: Thu, 15 Mar 2012 18:42:43 -0000 + +Show has to set --exclude=flag 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 4a60631..8ab2485 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -1099,13 +1099,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 ++ (append (list "--exclude=flag") 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 ++ (append (list "--exclude=flag") basic-args))))) + + (jit-lock-register #'notmuch-show-buttonise-links) + +-- +1.7.9.1 +