debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-29 06:04:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Use S-exp format everywhere

Browse source 
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.
This commit is contained in:
Austin Clements 2013-06-23 19:43:18 -04:00 committed by David Bremner
parent 2626d81573
commit 43251ab653
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emacs/notmuch-mua.el
View file

@ -146,7 +146,7 @@ list."
(unless (bolp) (insert "\n"))) (unless (bolp) (insert "\n")))
(defun notmuch-mua-reply (query-string &optional sender reply-all) (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 reply
original) original)
(when notmuch-show-process-crypto (when notmuch-show-process-crypto
@ -158,7 +158,7 @@ list."
(setq args (append args (list query-string))) (setq args (append args (list query-string)))
;; Get the reply object as JSON, and parse it into an elisp object. ;; 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. ;; Extract the original message to simplify the following code.
(setq original (plist-get reply :original)) (setq original (plist-get reply :original))

4
emacs/notmuch-query.el
View file

@ -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 list where the first element is a message, and the second element
is a possibly empty forest of replies. 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 (if notmuch-show-process-crypto
(setq args (append args '("--decrypt")))) (setq args (append args '("--decrypt"))))
(setq args (append args search-terms)) (setq args (append args search-terms))
(apply #'notmuch-call-notmuch-json args))) (apply #'notmuch-call-notmuch-sexp args)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mapping functions across collections of messages. ;; Mapping functions across collections of messages.

2
test/emacs-show
View file

@ -189,7 +189,7 @@ This is an error (see *Notmuch errors* for more details)
--- ---
[XXX] [XXX]
This is an error 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 exit status: 1
stderr: stderr:
This is an error This is an error