X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-query.el;h=592fd8f1cd88eeac4d77cd6b58a33fb3cde88053;hb=87ca29b7a737a9b52f1916156aef9511939b4376;hp=0d6e7759a6b57593597dbcdb70afe5128ee1b3bf;hpb=c2f3710a786dc8d610ccd8138ccfe5089686bec2;p=notmuch
diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 0d6e7759..592fd8f1 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,29 +15,26 @@
;; 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 &rest options)
+(defun notmuch-query-get-threads (search-terms)
"Return a list of threads of messages matching SEARCH-TERMS.
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 (append '("show" "--format=json") search-terms))
- (json-object-type 'plist)
- (json-array-type 'list)
- (json-false 'nil))
- (with-temp-buffer
- (progn
- (apply 'call-process (append (list notmuch-command nil t nil) args))
- (goto-char (point-min))
- (json-read)))))
+ (let ((args '("show" "--format=sexp" "--format-version=4")))
+ (if notmuch-show-process-crypto
+ (setq args (append args '("--decrypt"))))
+ (setq args (append args search-terms))
+ (apply #'notmuch-call-notmuch-sexp args)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mapping functions across collections of messages.
@@ -47,7 +44,7 @@ is a possibly empty forest of replies.
(apply 'append
(mapcar
(lambda (tree)
- (funcall mapper fn tree))
+ (funcall mapper function tree))
seq)))
(defun notmuch-query-map-threads (fn threads)
@@ -79,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