emacs: removed 3 duplicate functions from notmuch-show.el

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index ac2d29ecf5491bc318ac6ed19710d55d01298ee6..2baae5f111f5a04c5d48c6de1ccb43bf47b7fb2d 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -19,7 +19,6 @@
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
-(require 'json)
 (require 'message)
 (require 'mm-view)
 (require 'format-spec)
@@ -146,7 +145,7 @@ list."
   (unless (bolp) (insert "\n")))
 
 (defun notmuch-mua-reply (query-string &optional sender reply-all)
-  (let ((args '("reply" "--format=json"))
+  (let ((args '("reply" "--format=sexp" "--format-version=1"))
        reply
        original)
     (when notmuch-show-process-crypto
@@ -157,8 +156,8 @@ list."
       (setq args (append args '("--reply-to=sender"))))
     (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))
+    ;; Get the reply object as SEXP, and parse it into an elisp object.
+    (setq reply (apply #'notmuch-call-notmuch-sexp args))
 
     ;; Extract the original message to simplify the following code.
     (setq original (plist-get reply :original))