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.

diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index 34b62430dc2d6023a9fbcd8b42dffaea128c3ebb..9f027d2ae1e3e17df80e5d9118d230aa83de9e8a 100644 (file)
--- 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