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 B9F02431E82 for ; Sat, 3 Mar 2012 05:04:22 -0800 (PST) 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 BEN2gCgwtjk9 for ; Sat, 3 Mar 2012 05:04:21 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-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 907C9431FC4 for ; Sat, 3 Mar 2012 05:04:21 -0800 (PST) Received: by mail-ww0-f45.google.com with SMTP id ds10so171103wgb.2 for ; Sat, 03 Mar 2012 05:04:21 -0800 (PST) Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates 10.180.95.105 as permitted sender) client-ip=10.180.95.105; Authentication-Results: mr.google.com; spf=pass (google.com: domain of markwalters1009@gmail.com designates 10.180.95.105 as permitted sender) smtp.mail=markwalters1009@gmail.com; dkim=pass header.i=markwalters1009@gmail.com Received: from mr.google.com ([10.180.95.105]) by 10.180.95.105 with SMTP id dj9mr3813400wib.18.1330779861364 (num_hops = 1); Sat, 03 Mar 2012 05:04:21 -0800 (PST) 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=XvqlUFHU0fclHJXyE5g9qO+KMiD3k7R31rRPAGgSZMc=; b=cONAcpvf5ptwZKjTXcD7nIOa+Oc243uSNDfYpUn7MGHO2nv8xHopYeEXUlnWTUKtEJ A2Z8SjsPGb0lT7r0g0pIZGFOI3/QnqQLp6Pp6WlHg9rjkSUjajV+jIOO8I/qABE1TLI7 HlrrmOPcf3wcYuP82VAO66QLuzMTQt6CsdiiU6eKLv+UKjhq9nEDf0uyJ4TR3qgt++/E k4SwkpM3nHUaRKO0atUf0DB+PJzplu+WjGj2tFrDKHRAN9qcI3g++fEe3dChuzeqBVhw GHm2cEulYzOcrViL2yUpAqiye8oprpQZzAu3C/87ZaXfQHaaj0PsVyWRA1WrJwVc5g0z /KAg== Received: by 10.180.95.105 with SMTP id dj9mr3011015wib.18.1330779861209; Sat, 03 Mar 2012 05:04:21 -0800 (PST) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id gp8sm9374568wib.5.2012.03.03.05.04.19 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Mar 2012 05:04:20 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH 5/5] emacs: make show set --with-excluded Date: Sat, 3 Mar 2012 13:05:18 +0000 Message-Id: <1330779918-28024-6-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1330779918-28024-1-git-send-email-markwalters1009@gmail.com> References: <1330779918-28024-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, 03 Mar 2012 13:04:23 -0000 Show has to set --with-excluded to deal with cases where it is asked to show a single excluded message. It use 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..39c5713 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 "--with-excluded") 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 "--with-excluded") basic-args))))) (jit-lock-register #'notmuch-show-buttonise-links) -- 1.7.2.3