[PATCH v5 2/3] emacs: add a filter option to show

diff --git a/cd/e7f25defbf9d869a31f9034e567ff7b89b0061 b/cd/e7f25defbf9d869a31f9034e567ff7b89b0061
new file mode 100644 (file)
index 0000000..130dc17
--- /dev/null
+++ b/cd/e7f25defbf9d869a31f9034e567ff7b89b0061
@@ -0,0 +1,114 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 725C06DE1588\r
+ for <notmuch@notmuchmail.org>; Sat, 13 Jun 2015 01:08:24 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.349\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.349 tagged_above=-999 required=5 tests=[AWL=0.919, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01, SPF_PASS=-0.001] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id jjLayqi48q2V for <notmuch@notmuchmail.org>;\r
+ Sat, 13 Jun 2015 01:08:22 -0700 (PDT)\r
+Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com\r
+ [209.85.212.176])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 373226DE0C51\r
+ for <notmuch@notmuchmail.org>; Sat, 13 Jun 2015 01:08:21 -0700 (PDT)\r
+Received: by wibut5 with SMTP id ut5so34351890wib.1\r
+ for <notmuch@notmuchmail.org>; Sat, 13 Jun 2015 01:08:19 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+ bh=a6xFhodniWX+CCIakVjexRb6ep0LLoTn7VPDVlS8kB4=;\r
+ b=gPjNKHnaiTMgCPl4CzkUNc5BWNAZvOxgI2WcCMpThhJY5VPRfGMmg3mUvEhm/1ykM3\r
+ TTsVfEleT4bS70TU5ZenxIyqqD+VkBSA74S8kpL/i49YUkQRGUBd3055VloQpX1riXM3\r
+ owQJoUPapO+zKrp3NT3/ybyae8rxLjg+pPkBakl2UH33kkcG+wAnPOCtm7MHGGrVOAxG\r
+ pFGJz6Pj3RRXwvyy5CVfMN/Ow7sV7ih7xvh5O67KRSzDDHZl76jt/pX32FlMMZJEA5Cd\r
+ Ku/FqmosLK3ViJd8gcwC4O5AMtMuzUP6YSTgQtw74iQ947bqQtJHuOQCM4m8OLQeeCpS\r
+ MukA==\r
+X-Received: by 10.180.109.111 with SMTP id hr15mr14010927wib.53.1434182899752;\r
+  Sat, 13 Jun 2015 01:08:19 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+ by mx.google.com with ESMTPSA id z9sm6188635wiv.9.2015.06.13.01.08.18\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Sat, 13 Jun 2015 01:08:19 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 2/3] emacs: add a filter option to show\r
+Date: Sat, 13 Jun 2015 09:08:09 +0100\r
+Message-Id: <1434182890-8047-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1434182890-8047-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1434182890-8047-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Sat, 13 Jun 2015 08:08:24 -0000\r
+\r
+Show the current thread with a different filter (i.e., open messages\r
+in the thread matching the new query).\r
+\r
+Bound to 'l' for "limit".\r
+\r
+Note that it is not the same as filter in search mode as it replaces\r
+the existing query rather than ANDing with it (but it does keep the\r
+thread-id part of the query).\r
+---\r
+ emacs/notmuch-show.el | 12 ++++++++++++\r
+ 1 file changed, 12 insertions(+)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index a978d3c..4dee34b 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -47,6 +47,7 @@\r
+ (declare-function notmuch-tree "notmuch-tree"\r
+                 (&optional query query-context target buffer-name open-target))\r
+ (declare-function notmuch-tree-get-message-properties "notmuch-tree" nil)\r
++(declare-function notmuch-read-query "notmuch" (prompt))\r
+ \r
+ (defcustom notmuch-message-headers '("Subject" "To" "Cc" "Date")\r
+   "Headers that should be shown in a message, in this order.\r
+@@ -1372,6 +1373,7 @@ (defvar notmuch-show-mode-map\r
+     (define-key map (kbd "<backtab>") 'notmuch-show-previous-button)\r
+     (define-key map (kbd "TAB") 'notmuch-show-next-button)\r
+     (define-key map "f" 'notmuch-show-forward-message)\r
++    (define-key map "l" 'notmuch-show-filter-thread)\r
+     (define-key map "r" 'notmuch-show-reply-sender)\r
+     (define-key map "R" 'notmuch-show-reply)\r
+     (define-key map "|" 'notmuch-show-pipe-message)\r
+@@ -1660,6 +1662,16 @@ (defun notmuch-show-command-hook ()\r
+     (save-excursion\r
+       (funcall notmuch-show-mark-read-function (window-start) (window-end)))))\r
+ \r
++(defun notmuch-show-filter-thread (query)\r
++  "Filter or LIMIT the current thread based on a new query string.\r
++\r
++Reshows the current thread with matches defined by the new query-string."\r
++  (interactive (list (notmuch-read-query "Filter thread: ")))\r
++  (let ((msg-id (notmuch-show-get-message-id)))\r
++    (setq notmuch-show-query-context (if (string= query "") nil query))\r
++    (notmuch-show-refresh-view t)\r
++    (notmuch-show-goto-message msg-id)))\r
++\r
+ ;; Functions for getting attributes of several messages in the current\r
+ ;; thread.\r
+ \r
+-- \r
+2.1.4\r
+\r