From e877ff17c79c53e82628b9d2128b7810da86d4ae Mon Sep 17 00:00:00 2001 From: David Edmondson Date: Wed, 8 Feb 2012 08:02:12 +0000 Subject: [PATCH] [PATCH v8 2/8] emacs: Allow `notmuch-show-mode' to display only matching messages. --- 35/8cb83ccaee3cbf8817352665f0ca7570d90d8c | 114 ++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 35/8cb83ccaee3cbf8817352665f0ca7570d90d8c diff --git a/35/8cb83ccaee3cbf8817352665f0ca7570d90d8c b/35/8cb83ccaee3cbf8817352665f0ca7570d90d8c new file mode 100644 index 000000000..7cebbb3b4 --- /dev/null +++ b/35/8cb83ccaee3cbf8817352665f0ca7570d90d8c @@ -0,0 +1,114 @@ +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 38591431FC2 + for ; Wed, 8 Feb 2012 00:02:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 3lsFYtKYdjas for ; + Wed, 8 Feb 2012 00:02:29 -0800 (PST) +Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com + [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 15483431FB6 + for ; Wed, 8 Feb 2012 00:02:28 -0800 (PST) +Received: by wibhi8 with SMTP id hi8so201600wib.26 + for ; Wed, 08 Feb 2012 00:02:26 -0800 (PST) +Received: by 10.180.95.105 with SMTP id dj9mr38714867wib.18.1328688146476; + Wed, 08 Feb 2012 00:02:26 -0800 (PST) +Received: from hotblack-desiato.hh.sledj.net + (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) + by mx.google.com with ESMTPS id ex2sm709127wib.1.2012.02.08.00.02.22 + (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 08 Feb 2012 00:02:24 -0800 (PST) +Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) + id 46FBDA37FD; Wed, 8 Feb 2012 08:02:21 +0000 (GMT) +From: David Edmondson +To: notmuch@notmuchmail.org +Subject: [PATCH v8 2/8] emacs: Allow `notmuch-show-mode' to display only + matching messages. +Date: Wed, 8 Feb 2012 08:02:12 +0000 +Message-Id: <1328688139-3865-4-git-send-email-dme@dme.org> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1328688139-3865-1-git-send-email-dme@dme.org> +References: <1327486729-18052-1-git-send-email-dme@dme.org> + <1328688139-3865-1-git-send-email-dme@dme.org> +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: Wed, 08 Feb 2012 08:02:30 -0000 + +The current behaviour (all messages shown, non-matching collapsed) +is retained as the default. Type '!' to switch to showing only +the matching messages - non-matching messages are not available. +'!' will switch back to showing everything. +--- + emacs/notmuch-show.el | 18 +++++++++++++++++- + 1 files changed, 17 insertions(+), 1 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 058913a..cd5de8f 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -141,6 +141,10 @@ indentation." + (make-variable-buffer-local 'notmuch-show-process-crypto) + (put 'notmuch-show-process-crypto 'permanent-local t) + ++(defvar notmuch-show-elide-non-matching-messages nil) ++(make-variable-buffer-local 'notmuch-show-elide-non-matching-messages) ++(put 'notmuch-show-elide-non-matching-messages 'permanent-local t) ++ + (defmacro with-current-notmuch-show-message (&rest body) + "Evaluate body with current buffer set to the text of current message" + `(save-excursion +@@ -941,11 +945,22 @@ current buffer, if possible." + "Not processing cryptographic MIME parts.")) + (notmuch-show-refresh-view)) + ++(defun notmuch-show-toggle-elide-non-matching () ++ "Toggle the display of non-matching messages." ++ (interactive) ++ (setq notmuch-show-elide-non-matching-messages (not notmuch-show-elide-non-matching-messages)) ++ (message (if notmuch-show-elide-non-matching-messages ++ "Showing matching messages only." ++ "Showing all messages.")) ++ (notmuch-show-refresh-view)) ++ + (defun notmuch-show-insert-tree (tree depth) + "Insert the message tree TREE at depth DEPTH in the current thread." + (let ((msg (car tree)) + (replies (cadr tree))) +- (notmuch-show-insert-msg msg depth) ++ (if (or (not notmuch-show-elide-non-matching-messages) ++ (plist-get msg :match)) ++ (notmuch-show-insert-msg msg depth)) + (notmuch-show-insert-thread replies (1+ depth)))) + + (defun notmuch-show-insert-thread (thread depth) +@@ -1099,6 +1114,7 @@ Refreshes the current view, observing changes in cryptographic preferences." + (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all) + (define-key map (kbd "RET") 'notmuch-show-toggle-message) + (define-key map "#" 'notmuch-show-print-message) ++ (define-key map "!" 'notmuch-show-toggle-elide-non-matching) + (define-key map "$" 'notmuch-show-toggle-process-crypto) + map) + "Keymap for \"notmuch show\" buffers.") +-- +1.7.8.3 + -- 2.26.2