diff options
| -rw-r--r-- | emacs/notmuch-mua.el | 4 | ||||
| -rw-r--r-- | emacs/notmuch-query.el | 4 | ||||
| -rwxr-xr-x | test/emacs-show | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 24eebffa..329d3427 100644 --- 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 6e9f406d..51d427f2 100644 --- 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 9f2ccb0e..ae70053a 100755 --- 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 |