[PATCH] emacs: Added "is:<tag>" style completion to notmuch-read-query.

diff --git a/b7/554dbcb00b8349d31c31bb06190755e82333f5 b/b7/554dbcb00b8349d31c31bb06190755e82333f5
new file mode 100644 (file)
index 0000000..203322f
--- /dev/null
+++ b/b7/554dbcb00b8349d31c31bb06190755e82333f5
@@ -0,0 +1,91 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 388AD431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 07:12:14 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 0JuB9cQSEh4t for <notmuch@notmuchmail.org>;\r
+       Sat, 27 Dec 2014 07:12:11 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0BF55431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 27 Dec 2014 07:12:11 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Y4t2E-0006Ct-MZ; Sat, 27 Dec 2014 11:12:06 -0400\r
+Received: (nullmailer pid 27218 invoked by uid 1000); Sat, 27 Dec 2014\r
+       09:18:37 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Added "is:<tag>" style completion to\r
+       notmuch-read-query.\r
+Date: Sat, 27 Dec 2014 10:18:27 +0100\r
+Message-Id: <1419671907-27170-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.3\r
+In-Reply-To: <m2tx1fry0s.fsf@Jane.lan>\r
+References: <m2tx1fry0s.fsf@Jane.lan>\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: Sat, 27 Dec 2014 15:12:14 -0000\r
+\r
+From: Charles Celerier <cceleri@cs.stanford.edu>\r
+\r
+The notmuch-search-terms man page states that "tag:<tag>" is equivalent\r
+to "is:<tag>". Completion for "is:<tag>" style searches is now supported\r
+in the Emacs interface.\r
+\r
+Amended by David Bremner: combine lexical-let and let into\r
+lexical-let*\r
+---\r
+ emacs/notmuch.el | 16 +++++++++-------\r
+ 1 file changed, 9 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index 218486a..1b6971e 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -855,13 +855,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."\r
+   "Read a notmuch-query from the minibuffer with completion.\r
+ \r
+ PROMPT is the string to prompt with."\r
+-  (lexical-let\r
+-      ((completions\r
+-      (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"\r
+-                    "subject:" "attachment:")\r
+-              (mapcar (lambda (tag)\r
+-                        (concat "tag:" (notmuch-escape-boolean-term tag)))\r
+-                      (process-lines notmuch-command "search" "--output=tags" "*")))))\r
++  (lexical-let*\r
++      ((all-tags\r
++        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))\r
++                (process-lines notmuch-command "search" "--output=tags" "*")))\r
++       (completions\r
++       (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"\r
++                     "subject:" "attachment:")\r
++               (mapcar (lambda (tag) (concat "tag:" tag)) all-tags)\r
++               (mapcar (lambda (tag) (concat "is:" tag)) all-tags))))\r
+     (let ((keymap (copy-keymap minibuffer-local-map))\r
+         (current-query (case major-mode\r
+                          (notmuch-search-mode (notmuch-search-get-query))\r
+-- \r
+2.1.3\r
+\r