emacs: Use S-exp format everywhere

This switches `notmuch-mua-reply' and `notmuch-query-get-threads' to
the S-exp format.  These were the last two uses of the JSON format in
the Emacs frontend.

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 24eebffa3b97699d0d566d85f8c17dc40fc69642..329d3427ee33cab5546d6ab847ac9e52a93c1a2c 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -146,7 +146,7 @@ list."
   (unless (bolp) (insert "\n")))
 
 (defun notmuch-mua-reply (query-string &optional sender reply-all)
-  (let ((args '("reply" "--format=json" "--format-version=1"))
+  (let ((args '("reply" "--format=sexp" "--format-version=1"))
        reply
        original)
     (when notmuch-show-process-crypto
@@ -158,7 +158,7 @@ list."
     (setq args (append args (list query-string)))
 
     ;; Get the reply object as JSON, and parse it into an elisp object.
-    (setq reply (apply #'notmuch-call-notmuch-json args))
+    (setq reply (apply #'notmuch-call-notmuch-sexp args))
 
     ;; Extract the original message to simplify the following code.
     (setq original (plist-get reply :original))

diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 6e9f406d5c8fddf8559d8fc666af2929b4163ede..51d427f230038caf8782be5afafca11ca072c644 100644 (file)
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -29,11 +29,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=1")))
     (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.

diff --git a/test/emacs-show b/test/emacs-show
index 9f2ccb0e54fb86182e0448a035a9c0f07fa059ac..ae70053a6fb7aad80354268b5f5583e8ed846cee 100755 (executable)
--- a/test/emacs-show
+++ b/test/emacs-show
@@ -189,7 +189,7 @@ This is an error (see *Notmuch errors* for more details)
 ---
 [XXX]
 This is an error
-command: $PWD/notmuch_fail show --format\\=json --format-version\\=1 --exclude\\=false \\' \\* \\'
+command: $PWD/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'
 exit status: 1
 stderr:
 This is an error