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

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

[Charles Celerier]

The notmuch-search-terms man page states that "tag:<tag>" is equivalent
to "is:<tag>". Completion for "is:<tag>" style searches is now supported
in the Emacs interface.

Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
---
 emacs/notmuch.el | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 218486a..e4b77c7 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -855,13 +855,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
   "Read a notmuch-query from the minibuffer with completion.
 
 PROMPT is the string to prompt with."
+  (setq all-tags
+        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
+                (process-lines notmuch-command "search" "--output=tags" "*")))
   (lexical-let
       ((completions
 	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
 		      "subject:" "attachment:")
-		(mapcar (lambda (tag)
-			  (concat "tag:" (notmuch-escape-boolean-term tag)))
-			(process-lines notmuch-command "search" "--output=tags" "*")))))
+		(mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
+		(mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
     (let ((keymap (copy-keymap minibuffer-local-map))
 	  (current-query (case major-mode
 			   (notmuch-search-mode (notmuch-search-get-query))
-- 
2.1.2

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

[David Edmondson]

On Sat, Nov 29 2014, Charles Celerier wrote:
> The notmuch-search-terms man page states that "tag:<tag>" is equivalent
> to "is:<tag>". Completion for "is:<tag>" style searches is now supported
> in the Emacs interface.
>
> Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
> ---
>  emacs/notmuch.el | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
> index 218486a..e4b77c7 100644
> --- a/emacs/notmuch.el
> +++ b/emacs/notmuch.el
> @@ -855,13 +855,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
>    "Read a notmuch-query from the minibuffer with completion.
>  
>  PROMPT is the string to prompt with."
> +  (setq all-tags
> +        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
> +                (process-lines notmuch-command "search"
>                  "--output=tags" "*")))

Should use a `let' binding rather than `setq'. Otherwise, looks good.

>    (lexical-let
>        ((completions
>  	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
>  		      "subject:" "attachment:")
> -		(mapcar (lambda (tag)
> -			  (concat "tag:" (notmuch-escape-boolean-term tag)))
> -			(process-lines notmuch-command "search" "--output=tags" "*")))))
> +		(mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
> +		(mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
>      (let ((keymap (copy-keymap minibuffer-local-map))
>  	  (current-query (case major-mode
>  			   (notmuch-search-mode (notmuch-search-get-query))
> -- 
> 2.1.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

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

[David Bremner]

David Edmondson <dme@dme.org> writes:

> On Sat, Nov 29 2014, Charles Celerier wrote:

>
> Should use a `let' binding rather than `setq'. Otherwise, looks good.
>
>>    (lexical-let
>>        ((completions
>>  	(append (list "folder:" "path:" "thread:" "id:" "date:" "f

What about using lexical-let*  to combine the two binding forms?

d

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

[Charles Celerier]

The notmuch-search-terms man page states that "tag:<tag>" is equivalent
to "is:<tag>". Completion for "is:<tag>" style searches is now supported
in the Emacs interface.

Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
---
 emacs/notmuch.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 218486a..d29499c 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -856,12 +856,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
 
 PROMPT is the string to prompt with."
   (lexical-let
+    (( all-tags
+        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
+                (process-lines notmuch-command "search" "--output=tags" "*"))))
+  (let
       ((completions
 	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
 		      "subject:" "attachment:")
-		(mapcar (lambda (tag)
-			  (concat "tag:" (notmuch-escape-boolean-term tag)))
-			(process-lines notmuch-command "search" "--output=tags" "*")))))
+		(mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
+		(mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
     (let ((keymap (copy-keymap minibuffer-local-map))
 	  (current-query (case major-mode
 			   (notmuch-search-mode (notmuch-search-get-query))
@@ -884,7 +887,7 @@ PROMPT is the string to prompt with."
       (define-key keymap (kbd "TAB") 'minibuffer-complete)
       (let ((history-delete-duplicates t))
 	(read-from-minibuffer prompt nil keymap nil
-			      'notmuch-search-history current-query nil)))))
+			      'notmuch-search-history current-query nil))))))
 
 (defun notmuch-search-get-query ()
   "Return the current query in this search buffer"
-- 
2.1.2

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

[Charles Celerier]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

Just updated the patch to use lexical-let as suggested. I'm not too
familiar with emacs-lisp, so please tell me if you had something else in
mind.

charles

David Bremner <david@tethera.net> writes:

> David Edmondson <dme@dme.org> writes:
>
>> On Sat, Nov 29 2014, Charles Celerier wrote:
>
>>
>> Should use a `let' binding rather than `setq'. Otherwise, looks good.
>>
>>>    (lexical-let
>>>        ((completions
>>>  	(append (list "folder:" "path:" "thread:" "id:" "date:" "f
>
> What about using lexical-let*  to combine the two binding forms?
>
> d

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 480 bytes --]

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

[David Edmondson]

On Sat, Nov 29 2014, Charles Celerier wrote:
> The notmuch-search-terms man page states that "tag:<tag>" is equivalent
> to "is:<tag>". Completion for "is:<tag>" style searches is now supported
> in the Emacs interface.
>
> Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
> ---
>  emacs/notmuch.el | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
> index 218486a..d29499c 100644
> --- a/emacs/notmuch.el
> +++ b/emacs/notmuch.el
> @@ -856,12 +856,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
>  
>  PROMPT is the string to prompt with."
>    (lexical-let
> +    (( all-tags
> +        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
> +                (process-lines notmuch-command "search" "--output=tags" "*"))))
> +  (let

I think that David's suggestion was that you would have only one `let'
form, so something like:

 (lexical-let*
   ((all-tags (mapcar ...))
    (completions (append ...))
    (keymap (copy-keymap ...))
    (current-query ...))
     ...)

>        ((completions
>  	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
>  		      "subject:" "attachment:")
> -		(mapcar (lambda (tag)
> -			  (concat "tag:" (notmuch-escape-boolean-term tag)))
> -			(process-lines notmuch-command "search" "--output=tags" "*")))))
> +		(mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
> +		(mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
>      (let ((keymap (copy-keymap minibuffer-local-map))
>  	  (current-query (case major-mode
>  			   (notmuch-search-mode (notmuch-search-get-query))
> @@ -884,7 +887,7 @@ PROMPT is the string to prompt with."
>        (define-key keymap (kbd "TAB") 'minibuffer-complete)
>        (let ((history-delete-duplicates t))
>  	(read-from-minibuffer prompt nil keymap nil
> -			      'notmuch-search-history current-query nil)))))
> +			      'notmuch-search-history current-query nil))))))
>  
>  (defun notmuch-search-get-query ()
>    "Return the current query in this search buffer"
> -- 
> 2.1.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

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

[Charles Celerier]

[-- Attachment #1: Type: text/plain, Size: 2643 bytes --]

Can the variables in the varlist depend on the definition of variables
that precede them in the list? I believe I tried your suggestion, but
quickly gave up as Emacs gave me an error claiming that all-tags was
void.

charles

David Edmondson <dme@dme.org> writes:

> On Sat, Nov 29 2014, Charles Celerier wrote:
>> The notmuch-search-terms man page states that "tag:<tag>" is equivalent
>> to "is:<tag>". Completion for "is:<tag>" style searches is now supported
>> in the Emacs interface.
>>
>> Signed-off-by: Charles Celerier <cceleri@cs.stanford.edu>
>> ---
>>  emacs/notmuch.el | 11 +++++++----
>>  1 file changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
>> index 218486a..d29499c 100644
>> --- a/emacs/notmuch.el
>> +++ b/emacs/notmuch.el
>> @@ -856,12 +856,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
>>  
>>  PROMPT is the string to prompt with."
>>    (lexical-let
>> +    (( all-tags
>> +        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
>> +                (process-lines notmuch-command "search" "--output=tags" "*"))))
>> +  (let
>
> I think that David's suggestion was that you would have only one `let'
> form, so something like:
>
>  (lexical-let*
>    ((all-tags (mapcar ...))
>     (completions (append ...))
>     (keymap (copy-keymap ...))
>     (current-query ...))
>      ...)
>
>>        ((completions
>>  	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
>>  		      "subject:" "attachment:")
>> -		(mapcar (lambda (tag)
>> -			  (concat "tag:" (notmuch-escape-boolean-term tag)))
>> -			(process-lines notmuch-command "search" "--output=tags" "*")))))
>> +		(mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
>> +		(mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
>>      (let ((keymap (copy-keymap minibuffer-local-map))
>>  	  (current-query (case major-mode
>>  			   (notmuch-search-mode (notmuch-search-get-query))
>> @@ -884,7 +887,7 @@ PROMPT is the string to prompt with."
>>        (define-key keymap (kbd "TAB") 'minibuffer-complete)
>>        (let ((history-delete-duplicates t))
>>  	(read-from-minibuffer prompt nil keymap nil
>> -			      'notmuch-search-history current-query nil)))))
>> +			      'notmuch-search-history current-query nil))))))
>>  
>>  (defun notmuch-search-get-query ()
>>    "Return the current query in this search buffer"
>> -- 
>> 2.1.2
>>
>> _______________________________________________
>> notmuch mailing list
>> notmuch@notmuchmail.org
>> http://notmuchmail.org/mailman/listinfo/notmuch

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 480 bytes --]

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

[Lele Gaifax]

Charles Celerier <cceleri@cs.stanford.edu>
writes:

> Can the variables in the varlist depend on the definition of variables
> that precede them in the list? I believe I tried your suggestion, but
> quickly gave up as Emacs gave me an error claiming that all-tags was
> void.

Yes, with the let*/lexical-let* variants of let/lexical-let. This is
stated in the let* documentation (that is, C-h f let* RET).

ciao, lele.
-- 
nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia.
lele@metapensiero.it  |                 -- Fortunato Depero, 1929.

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

[David Bremner]

Charles Celerier <cceleri@cs.stanford.edu> writes:

> Can the variables in the varlist depend on the definition of variables
> that precede them in the list? I believe I tried your suggestion, but
> quickly gave up as Emacs gave me an error claiming that all-tags was
> void.

That's the point of lexical-let* vs lexical-let

d

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

[Charles Celerier]

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

I see now. I tried using lexical-let*, but now it appears that pulling
the assignment of minibuffer-completion-table into the lexical-let*
breaks the function, while pulling all the other assigments in works
fine. I'm not sure why that happens. I am not a very skilled emacs-lisp
programmer, so I am afraid something funny is happening here that is
beyond my understanding.

charles

David Bremner <david@tethera.net> writes:

> Charles Celerier <cceleri@cs.stanford.edu> writes:
>
>> Can the variables in the varlist depend on the definition of variables
>> that precede them in the list? I believe I tried your suggestion, but
>> quickly gave up as Emacs gave me an error claiming that all-tags was
>> void.
>
> That's the point of lexical-let* vs lexical-let
>
> d

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 480 bytes --]

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

[David Bremner]

From: Charles Celerier <cceleri@cs.stanford.edu>

The notmuch-search-terms man page states that "tag:<tag>" is equivalent
to "is:<tag>". Completion for "is:<tag>" style searches is now supported
in the Emacs interface.

Amended by David Bremner: combine lexical-let and let into
lexical-let*
---
 emacs/notmuch.el | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 218486a..1b6971e 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -855,13 +855,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
   "Read a notmuch-query from the minibuffer with completion.
 
 PROMPT is the string to prompt with."
-  (lexical-let
-      ((completions
-	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
-		      "subject:" "attachment:")
-		(mapcar (lambda (tag)
-			  (concat "tag:" (notmuch-escape-boolean-term tag)))
-			(process-lines notmuch-command "search" "--output=tags" "*")))))
+  (lexical-let*
+      ((all-tags
+        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
+                (process-lines notmuch-command "search" "--output=tags" "*")))
+       (completions
+	 (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
+		       "subject:" "attachment:")
+		 (mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
+		 (mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
     (let ((keymap (copy-keymap minibuffer-local-map))
 	  (current-query (case major-mode
 			   (notmuch-search-mode (notmuch-search-get-query))
-- 
2.1.3

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

[Mark Walters]

Hi

> From: Charles Celerier <cceleri@cs.stanford.edu>
>
> The notmuch-search-terms man page states that "tag:<tag>" is equivalent
> to "is:<tag>". Completion for "is:<tag>" style searches is now supported
> in the Emacs interface.
>
> Amended by David Bremner: combine lexical-let and let into
> lexical-let*

This version looks good to me; it works and passes all tests. +1

Note it does not apply to master but only needs a tiny fixup (see below)

Best wishes

Mark

> ---
>  emacs/notmuch.el | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/emacs/notmuch.el b/emacs/notmuch.el
> index 218486a..1b6971e 100644
> --- a/emacs/notmuch.el
> +++ b/emacs/notmuch.el
> @@ -855,13 +855,15 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
>    "Read a notmuch-query from the minibuffer with completion.
>  
>  PROMPT is the string to prompt with."
> -  (lexical-let
> -      ((completions
> -	(append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
> -		      "subject:" "attachment:")
                                        
^ this line now has a "mimetype:" final option

> -		(mapcar (lambda (tag)
> -			  (concat "tag:" (notmuch-escape-boolean-term tag)))
> -			(process-lines notmuch-command "search" "--output=tags" "*")))))
> +  (lexical-let*
> +      ((all-tags
> +        (mapcar (lambda (tag) (notmuch-escape-boolean-term tag))
> +                (process-lines notmuch-command "search" "--output=tags" "*")))
> +       (completions
> +	 (append (list "folder:" "path:" "thread:" "id:" "date:" "from:" "to:"
> +		       "subject:" "attachment:")
> +		 (mapcar (lambda (tag) (concat "tag:" tag)) all-tags)
> +		 (mapcar (lambda (tag) (concat "is:" tag)) all-tags))))
>      (let ((keymap (copy-keymap minibuffer-local-map))
>  	  (current-query (case major-mode
>  			   (notmuch-search-mode (notmuch-search-get-query))
> -- 
> 2.1.3
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

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

[David Bremner]

David Bremner <david@tethera.net> writes:

> From: Charles Celerier <cceleri@cs.stanford.edu>
>
> The notmuch-search-terms man page states that "tag:<tag>" is equivalent
> to "is:<tag>". Completion for "is:<tag>" style searches is now supported
> in the Emacs interface.
>
> Amended by David Bremner: combine lexical-let and let into
> lexical-let*

Pushed. I had to resolve conflicts by hand, which is why I didn't merge
it for 0.20.

d