From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/3] emacs: Use S-exp format everywhere
Date: Sun, 23 Jun 2013 19:43:18 -0400 [thread overview]
Message-ID: <1372030999-1262-2-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1372030999-1262-1-git-send-email-amdragon@mit.edu>
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.
---
emacs/notmuch-mua.el | 4 ++--
emacs/notmuch-query.el | 4 ++--
test/emacs-show | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 24eebff..329d342 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 6e9f406..51d427f 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 9f2ccb0..ae70053 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
--
1.7.10.4
next prev parent reply other threads:[~2013-06-23 23:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-23 23:43 [PATCH 1/3] emacs: Introduce `notmuch-call-notmuch-sexp' Austin Clements
2013-06-23 23:43 ` Austin Clements [this message]
2013-06-23 23:43 ` [PATCH 3/3] emacs: Remove `notmuch-call-notmuch-json' Austin Clements
2013-06-24 15:35 ` [PATCH 1/3] emacs: Introduce `notmuch-call-notmuch-sexp' Tomi Ollila
2013-06-24 19:00 ` Mark Walters
2013-06-24 19:11 ` Austin Clements
2013-06-24 19:29 ` Mark Walters
2013-06-25 6:06 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372030999-1262-2-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).