DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma;
	h=from:to:cc:subject:in-reply-to:references:user-agent:date
	:message-id:mime-version:content-type;
	b=LRpgwoUp0d53JJncNSNvUBfXY+rPDSWr+4+ezKv08hg3XA2h/eoCZIBBtKw/z8YTNS
	Vj0QTQwto0hvXSqBDmPpEizLZFsbFfYafwFCkojbNnDj3zimOfZ10nomNX7po8P+/MG9
	UGRkPpl0EpkQCIt4SuyoIxDvSrTtIG6rzLSfc=
From: Daniel Schoepe <daniel.schoepe@googlemail.com>
To: Austin Clements <amdragon@MIT.EDU>
Subject: Re: [PATCH] emacs: Tab completion for notmuch-search and
	notmuch-search-filter
In-Reply-To: <87hb85jjgx.fsf@gilead.invalid>
References: <1307189970-728-1-git-send-email-daniel.schoepe@googlemail.com>
	<BANLkTimudbqYy8JhGHu67WsOS04mCm0hfA@mail.gmail.com>
	<87mxhxjrry.fsf@gilead.invalid> <20110604215523.GF29861@mit.edu>
	<87hb85jjgx.fsf@gilead.invalid>
User-Agent: Notmuch/0.5-225-ga896936 (http://notmuchmail.org) Emacs/23.3.1
	(x86_64-pc-linux-gnu)
Date: Mon, 06 Jun 2011 18:32:41 +0200
Message-ID: <87lixevs2e.fsf@gilead.invalid>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
	micalg=pgp-sha1; protocol="application/pgp-signature"
Cc: notmuch@notmuchmail.org
Precedence: list

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=

I accidentally left a, now unnecessary, defvar in the patch from one of
the previous attempts, here is the updated version (thanks Austin for
noticing).


--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline;
 filename=0001-emacs-Tab-completion-for-notmuch-search-and-notmuch-.patch
Content-Transfer-Encoding: quoted-printable

From=20f3bc7376edc66e947d8fdf5931a9aa697b9be5cf Mon Sep 17 00:00:00 2001
From: Daniel Schoepe <daniel.schoepe@googlemail.com>
Date: Sat, 4 Jun 2011 14:17:44 +0200
Subject: [PATCH] emacs: Tab completion for notmuch-search and
 notmuch-search-filter

This patch adds completion with <tab> in the minibuffer for
notmuch-search and notmuch-search-filter.
=2D--
 emacs/notmuch.el |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 3311fe8..7ffbc3a 100644
=2D-- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -882,6 +882,35 @@ characters as well as `_.+-'.
 	   (concat "*notmuch-search-" query "*"))
 	  )))
=20
+(defun notmuch-read-query (prompt)
+  "Read a notmuch-query from the minibuffer with completion.
+
+PROMPT is the string to prompt with."
+  (lexical-let
+      ((completions=20
+	(append (list "folder:" "thread:" "id:" "date:" "from:" "to:"
+		      "subject:" "attachment:")
+		(mapcar (lambda (tag)
+			  (concat "tag:" tag))
+			(process-lines "notmuch" "search-tags")))))
+    (let ((keymap (copy-keymap minibuffer-local-map))
+	  (minibuffer-completion-table
+	   (completion-table-dynamic
+	    (lambda (string)
+	      ;; generate a list of possible completions for the current input
+	      (cond
+	       ;; this ugly regexp is used to get the last word of the input
+	       ;; possibly preceded by a '('
+	       ((string-match "\\(^\\|.* (?\\)\\([^ ]*\\)$" string)
+		(mapcar (lambda (compl)
+			  (concat (match-string-no-properties 1 string) compl))
+			(all-completions (match-string-no-properties 2 string)
+					 completions)))
+	       (t (list string)))))))
+      ;; this was simpler than convincing completing-read to accept spaces:
+      (define-key keymap (kbd "<tab>") 'minibuffer-complete)
+      (read-from-minibuffer prompt nil keymap nil minibuffer-history nil n=
il))))
+
 ;;;###autoload
 (defun notmuch-search (query &optional oldest-first target-thread target-l=
ine continuation)
   "Run \"notmuch search\" with the given query string and display results.
@@ -893,7 +922,7 @@ The optional parameters are used as follows:
                  current if it appears in the search results.
   target-line: The line number to move to if the target thread does not
                appear in the search results."
=2D  (interactive "sNotmuch search: ")
+  (interactive (list (notmuch-read-query "Notmuch search: ")))
   (let ((buffer (get-buffer-create (notmuch-search-buffer-title query))))
     (switch-to-buffer buffer)
     (notmuch-search-mode)
@@ -991,7 +1020,7 @@ search."
=20
 Runs a new search matching only messages that match both the
 current search results AND the additional query string provided."
=2D  (interactive "sFilter search: ")
+  (interactive (list (notmuch-read-query "Filter search: ")))
   (let ((grouped-query (if (string-match-p notmuch-search-disjunctive-rege=
xp query)
 			   (concat "( " query " )")
 			 query)))
=2D-=20
1.7.5.3


--=-=-=--

--==-=-=
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBAgAGBQJN7QEpAAoJEIaTAtce+Z+JkAIP/ilrKOti8iwVo/u1A0CtX2R+
cVF4NAGzsWoK0KsYTNFPV3dtssmJXemMPPtBbXI+W+Q6axPUXsSbV1XY/f/3yRlw
sS0hUmqGbmUZiBKzVaNJ/bH2nDZkBbEqsUMTaMfKYr7UbnnPYXCS82FFr2zDRlBQ
bOBokkBMvmaIKLDXJuuRbtkZc3/5M61nWKqO7SBVySjgkflDIgItiLbNdimu7M47
Fj/N7yyDww+YcQVynqj0EiOVZRzJ4g4o5BGhx8fcpNk6MUH/IeokwP2pp1/NhMWB
iWi1qj3c/V0d4XEibMXyAc+8mpVaB+izWopRIx5+KdRAp/CJR+qvSgWBwJEtvbeY
RvBFh0+GF3skontDhuiHnu3IX1625QRHPxrvm+wZaOWC8p5vdPOtGO7hvWTvVKYQ
ykmljx/JrBoWUBG/rN21BGq1f739dMsuLJ2MLw0w8ZFU0OXQr9AhQnb+8RSpNIJE
brCM+cpvpVzwpvhmI0T5/VeqORSuunO11pvj3543xuLU36sfI5atxR1pz7cZBE2x
qoHzmq2kI+HMMfNb2bM5m0VQslcGURrO3ZIDWORSzjhChiw1EhC5vyL8YRtVDRxQ
/ED/NSaXu3O507owBh4uFIdq4CbNhkCxIdtFC+hjQGu53HObSyx5N0rn9FikHILG
tM+b8pzAaAH/s3kWxM3i
=JRlC
-----END PGP SIGNATURE-----
--==-=-=--