diff options
| author |  Austin Clements <amdragon@MIT.EDU> | 2013-06-23 19:43:18 -0400 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2013-06-24 22:57:13 -0700 |
| commit | 43251ab653a20c0f7cca709d36da895c3558e125 (patch) | |
| tree | 5a2d1ea1dd12c304a0ca16aa4eef1af838abadac /emacs | |
| parent | 2626d815733b5ee04080bc81c75311d812b7c6f5 (diff) | |
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.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-mua.el | 4 | ||||
| -rw-r--r-- | emacs/notmuch-query.el | 4 |
2 files changed, 4 insertions, 4 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. |