X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-query.el;h=563e4acf57df3ab2c017085aea4c03d0677c3b72;hb=c0868d959d38d1178acd8b1cba14a0944ea0c2a4;hp=e7e352072887f3315a3ede255984b9db9a530006;hpb=66c935cff37fcab1ef7b0a5cecf5bc1c62d8d2ed;p=notmuch
diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index e7e35207..563e4acf 100644
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -1,4 +1,4 @@
-;; notmuch-query.el --- provide an emacs api to query notmuch
+;;; notmuch-query.el --- provide an emacs api to query notmuch
;;
;; Copyright © David Bremner
;;
@@ -15,12 +15,13 @@
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with Notmuch. If not, see .
+;; along with Notmuch. If not, see .
;;
;; Authors: David Bremner
+;;; Code:
+
(require 'notmuch-lib)
-(require 'json)
(defun notmuch-query-get-threads (search-terms)
"Return a list of threads of messages matching SEARCH-TERMS.
@@ -29,11 +30,11 @@ A thread is a forest or list of trees. A tree is a two element
list where the first element is a message, and the second element
is a possibly empty forest of replies.
"
- (let ((args '("show" "--format=json")))
+ (let ((args '("show" "--format=sexp" "--format-version=4")))
(if notmuch-show-process-crypto
- (setq args (append args '("--decrypt"))))
+ (setq args (append args '("--decrypt=true"))))
(setq args (append args search-terms))
- (apply #'notmuch-call-notmuch-json args)))
+ (apply #'notmuch-call-notmuch-sexp args)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mapping functions across collections of messages.
@@ -75,3 +76,5 @@ See the function notmuch-query-get-threads for more information."
(notmuch-query-get-threads search-terms)))
(provide 'notmuch-query)
+
+;;; notmuch-query.el ends here