cli: implement structured output version 4

[notmuch] / emacs / notmuch-query.el

diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 6e9f406d5c8fddf8559d8fc666af2929b4163ede..592fd8f1cd88eeac4d77cd6b58a33fb3cde88053 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+;; along with Notmuch.  If not, see <https://www.gnu.org/licenses/>.
 ;;
 ;; Authors: David Bremner <david@tethera.net>
 
+;;; 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" "--format-version=1")))
+  (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-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