[PATCH 2/3 v2] emacs: Allow `notmuch-show-mode' to display only matching messages.

diff --git a/70/c11dc9a5b7aba37522a5e44a72a53ef43873b8 b/70/c11dc9a5b7aba37522a5e44a72a53ef43873b8
new file mode 100644 (file)
index 0000000..3c7c8ab
--- /dev/null
+++ b/70/c11dc9a5b7aba37522a5e44a72a53ef43873b8
@@ -0,0 +1,114 @@
+Return-Path: <dme@dme.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C302F429E34\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 03:31:40 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 6ltgvsxNBERk for <notmuch@notmuchmail.org>;\r
+       Mon, 30 Jan 2012 03:31:40 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 26540431FBC   for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 03:31:40 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so3865828wgb.2\r
+       for <notmuch@notmuchmail.org>; Mon, 30 Jan 2012 03:31:38 -0800 (PST)\r
+Received: by 10.180.95.105 with SMTP id dj9mr26539210wib.18.1327923098924;\r
+       Mon, 30 Jan 2012 03:31:38 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id eq5sm51602955wib.2.2012.01.30.03.31.37\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 30 Jan 2012 03:31:37 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id BCB719FE47; Mon, 30 Jan 2012 11:31:35 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/3 v2] emacs: Allow `notmuch-show-mode' to display only\r
+       matching messages.\r
+Date: Mon, 30 Jan 2012 11:31:32 +0000\r
+Message-Id: <1327923093-31065-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327923093-31065-1-git-send-email-dme@dme.org>\r
+References: <1327486729-18052-1-git-send-email-dme@dme.org>\r
+       <1327923093-31065-1-git-send-email-dme@dme.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 30 Jan 2012 11:31:41 -0000\r
+\r
+The current behaviour (all messages shown, non-matching collapsed)\r
+is retained as the default. Type '!' to switch to showing only\r
+the matching messages - non-matching messages are not available.\r
+'!' will switch back to showing everything.\r
+---\r
+ emacs/notmuch-show.el |   18 +++++++++++++++++-\r
+ 1 files changed, 17 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 53f6ae4..99478a4 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -135,6 +135,10 @@ indentation."\r
+ (make-variable-buffer-local 'notmuch-show-process-crypto)\r
+ (put 'notmuch-show-process-crypto 'permanent-local t)\r
+ \r
++(defvar notmuch-show-elide-non-matching-messages nil)\r
++(make-variable-buffer-local 'notmuch-show-elide-non-matching-messages)\r
++(put 'notmuch-show-elide-non-matching-messages 'permanent-local t)\r
++\r
+ (defmacro with-current-notmuch-show-message (&rest body)\r
+   "Evaluate body with current buffer set to the text of current message"\r
+   `(save-excursion\r
+@@ -922,11 +926,22 @@ current buffer, if possible."\r
+            "Not processing cryptographic MIME parts."))\r
+   (notmuch-show-refresh-view))\r
+ \r
++(defun notmuch-show-toggle-elide-non-matching ()\r
++  "Toggle the display of non-matching messages."\r
++  (interactive)\r
++  (setq notmuch-show-elide-non-matching-messages (not notmuch-show-elide-non-matching-messages))\r
++  (message (if notmuch-show-elide-non-matching-messages\r
++             "Showing matching messages only."\r
++           "Showing all messages."))\r
++  (notmuch-show-refresh-view))\r
++\r
+ (defun notmuch-show-insert-tree (tree depth)\r
+   "Insert the message tree TREE at depth DEPTH in the current thread."\r
+   (let ((msg (car tree))\r
+       (replies (cadr tree)))\r
+-    (notmuch-show-insert-msg msg depth)\r
++    (if (or (not notmuch-show-elide-non-matching-messages)\r
++          (plist-get msg :match))\r
++      (notmuch-show-insert-msg msg depth))\r
+     (notmuch-show-insert-thread replies (1+ depth))))\r
+ \r
+ (defun notmuch-show-insert-thread (thread depth)\r
+@@ -1079,6 +1094,7 @@ Refreshes the current view, observing changes in cryptographic preferences."\r
+       (define-key map (kbd "M-RET") 'notmuch-show-open-or-close-all)\r
+       (define-key map (kbd "RET") 'notmuch-show-toggle-message)\r
+       (define-key map "#" 'notmuch-show-print-message)\r
++      (define-key map "!" 'notmuch-show-toggle-elide-non-matching)\r
+       (define-key map "$" 'notmuch-show-toggle-process-crypto)\r
+       map)\r
+       "Keymap for \"notmuch show\" buffers.")\r
+-- \r
+1.7.8.3\r
+\r