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

emacs: Use --format-version for search, show, and reply

Browse source
This commit is contained in:
Austin Clements 2012-12-15 22:17:29 -05:00 committed by David Bremner
parent 0df6dcfe76
commit 2cdb3f54f7
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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")) (let ((args '("reply" "--format=json" "--format-version=1"))
reply reply
original) original)
(when notmuch-show-process-crypto (when notmuch-show-process-crypto

2
emacs/notmuch-query.el
View file

@ -29,7 +29,7 @@ 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"))) (let ((args '("show" "--format=json" "--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))

6
emacs/notmuch.el
View file

@ -650,6 +650,10 @@ of the result."
(insert "Incomplete search results (search process was killed).\n")) (insert "Incomplete search results (search process was killed).\n"))
(when (eq status 'exit) (when (eq status 'exit)
(insert "End of search results.\n") (insert "End of search results.\n")
;; For version mismatch, there's no point in
;; showing the search buffer
(when (or (= exit-status 20) (= exit-status 21))
(kill-buffer))
(condition-case nil (condition-case nil
(notmuch-check-async-exit-status proc msg) (notmuch-check-async-exit-status proc msg)
;; Suppress the error signal since strange ;; Suppress the error signal since strange
@ -935,7 +939,7 @@ Other optional parameters are used as follows:
(let ((proc (start-process (let ((proc (start-process
"notmuch-search" buffer "notmuch-search" buffer
notmuch-command "search" notmuch-command "search"
"--format=json" "--format=json" "--format-version=1"
(if oldest-first (if oldest-first
"--sort=oldest-first" "--sort=oldest-first"
"--sort=newest-first") "--sort=newest-first")

2
test/emacs
View file

@ -873,7 +873,7 @@ This is output
Error: Unexpected output from notmuch search: Error: Unexpected output from notmuch search:
This is an error This is an error
End of search results. End of search results.
Error invoking notmuch. $PWD/notmuch_fail search --format=json --sort=newest-first tag:inbox exited with status 1." Error invoking notmuch. $PWD/notmuch_fail search --format=json --format-version=1 --sort=newest-first tag:inbox exited with status 1."
test_done test_done

2
test/emacs-show
View file

@ -178,7 +178,7 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
(with-current-buffer \"*Notmuch errors*\" (with-current-buffer \"*Notmuch errors*\"
(test-output \"ERROR\")))" (test-output \"ERROR\")))"
test_expect_equal "$(cat OUTPUT ERROR)" "\ test_expect_equal "$(cat OUTPUT ERROR)" "\
Error invoking notmuch. $PWD/notmuch_fail show --format=json --exclude=false ' * ' exited with status 1. Error invoking notmuch. $PWD/notmuch_fail show --format=json --format-version=1 --exclude=false ' * ' exited with status 1.
Error: Error:
This is an error This is an error
Output: Output: