From a4fe9299563d5144509add9b02f2c717c838393c Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Thu, 4 May 2017 13:09:32 +0800 Subject: [PATCH] Notmuch query transformation improvements * lisp/gnus/gnus-search.el (gnus-search-transform-expression): A "body" keyword should just be removed. Also, strip angle brackets from message ids. --- lisp/gnus/gnus-search.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el index 34b62430dc2..9f027d2ae1e 100644 --- a/lisp/gnus/gnus-search.el +++ b/lisp/gnus/gnus-search.el @@ -1644,8 +1644,14 @@ absolute filepaths to standard out." (cond ((consp (car expr)) (format "(%s)") (gnus-search-transform engine expr)) + ((eql (car expr) 'body) + (cdr expr)) ((memq (car expr) '(from to subject attachment mimetype tag id thread folder path lastmod query property)) + ;; Notmuch requires message-id with no angle brackets. + (when (eql (car expr) 'id) + (setcdr + expr (replace-regexp-in-string "\\`<\\|>\\'" "" (cdr expr)))) (format "%s:%s" (car expr) (if (string-match "\\`\\*" (cdr expr)) ;; Notmuch can only handle trailing asterisk -- 2.39.5