[Patch v3 1/2] emacs: add a filter option to show

diff --git a/b8/61163eba09ecc8b7f6b4348064609a27331760 b/b8/61163eba09ecc8b7f6b4348064609a27331760
new file mode 100644 (file)
index 0000000..232c74b
--- /dev/null
+++ b/b8/61163eba09ecc8b7f6b4348064609a27331760
@@ -0,0 +1,112 @@
+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 olra.theworths.org (Postfix) with ESMTP id 0F26A431FD7\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Apr 2012 12:14:49 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 aWUV9odf8EzZ for <notmuch@notmuchmail.org>;\r
+       Thu, 26 Apr 2012 12:14:48 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-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
+ BBA0D431FB6   for <notmuch@notmuchmail.org>; Thu, 26 Apr 2012 12:14:47 -0700\r
+ (PDT)\r
+Received: by wgbdt14 with SMTP id dt14so1310020wgb.2\r
+       for <notmuch@notmuchmail.org>; Thu, 26 Apr 2012 12:14:46 -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:x-mailer:in-reply-to:references;\r
+       bh=RJo7MnMrRNaFlqSCIkZ9CsJb9sECfTyqURxcovwpRvY=;\r
+       b=xLXPRKSqTrRsH7NsEqPSbLsONYXeWUkO+uyYRSZpRrroF/4qoAkuiyfTJJQCZEOTt/\r
+       w8plpuXaTB3/TorpxDsnMp/3H5wMK/NTbtErfaZzsWTse4TTMhmb9mQwfiKwCThQDSmI\r
+       dO6sY0RvieKmFokIrQedeMthySU4F5XaXm4xvjU3h090LN85Pyi+guVgPWFfz0w4P9Jg\r
+       fFA+bEKpOH5qtmcmgmT9bw2rgWG/KZHHJOSoq3FZZm4Tj6ECiMkYUEGDWtjvMoy9y6Ie\r
+       cisP7cdoTwiHxwsLA7DYe6/Ke9LKCyQy7tKDThkUEuHFJAW8yKfGr9+RSX94/juMNKWA\r
+       BifQ==\r
+Received: by 10.216.131.154 with SMTP id m26mr4747055wei.91.1335467686532;\r
+       Thu, 26 Apr 2012 12:14:46 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ k6sm46648801wie.9.2012.04.26.12.14.45 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 26 Apr 2012 12:14:45 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v3 1/2] emacs: add a filter option to show\r
+Date: Thu, 26 Apr 2012 20:14:48 +0100\r
+Message-Id: <1335467689-6513-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1335467689-6513-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1335467689-6513-1-git-send-email-markwalters1009@gmail.com>\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: Thu, 26 Apr 2012 19:14:49 -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 |   10 ++++++++++\r
+ 1 files changed, 10 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 30b26d1..492da72 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -42,6 +42,7 @@\r
+ (declare-function notmuch-search-next-thread "notmuch" nil)\r
+ (declare-function notmuch-search-show-thread "notmuch" nil)\r
+ (declare-function notmuch-update-tags "notmuch" (current-tags tag-changes))\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
+@@ -1157,6 +1158,7 @@ reset based on the original query."\r
+       (define-key map "s" 'notmuch-search)\r
+       (define-key map "m" 'notmuch-mua-new-mail)\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
+@@ -1399,6 +1401,14 @@ current thread."\r
+   "Mark the current message as read."\r
+   (notmuch-show-tag-message "-unread"))\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
++  (setq notmuch-show-query-context (if (string= query "") nil query))\r
++  (notmuch-show-refresh-view t))\r
++\r
+ ;; Functions for getting attributes of several messages in the current\r
+ ;; thread.\r
+ \r
+-- \r
+1.7.9.1\r
+\r