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

emacs: convert remaining format-versions from 3 to 4

Browse source 
This is needed for consistent beheviour between notmuch built against
gmime-2.6 and gmime-3.0 w.r.t. error reporting.
This commit is contained in:
David Bremner 2017-07-17 12:06:11 -03:00
parent d55fffffd7
commit 1d82110f83
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emacs/notmuch-address.el
View file

@ -317,7 +317,7 @@ execution, CALLBACK is called when harvesting finishes."
(when config-query (when config-query
(format " and (%s)" config-query))) (format " and (%s)" config-query)))
from-or-to-me-query)) from-or-to-me-query))
(args `("address" "--format=sexp" "--format-version=3" (args `("address" "--format=sexp" "--format-version=4"
,(if sent "--output=recipients" "--output=sender") ,(if sent "--output=recipients" "--output=sender")
"--deduplicate=address" "--deduplicate=address"
,query))) ,query)))

2
emacs/notmuch-mua.el
View file

@ -176,7 +176,7 @@ mutiple parts get a header."
(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=sexp" "--format-version=3")) (let ((args '("reply" "--format=sexp" "--format-version=4"))
(process-crypto notmuch-show-process-crypto) (process-crypto notmuch-show-process-crypto)
reply reply
original) original)

2
emacs/notmuch-tree.el
View file

@ -917,7 +917,7 @@ the same as for the function notmuch-tree."
(notmuch-tag-clear-cache) (notmuch-tag-clear-cache)
(let ((proc (notmuch-start-notmuch (let ((proc (notmuch-start-notmuch
"notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel
"show" "--body=false" "--format=sexp" "--format-version=3" "show" "--body=false" "--format=sexp" "--format-version=4"
message-arg search-args)) message-arg search-args))
;; Use a scratch buffer to accumulate partial output. ;; Use a scratch buffer to accumulate partial output.
;; This buffer will be killed by the sentinel, which ;; This buffer will be killed by the sentinel, which

2
emacs/notmuch.el
View file

@ -994,7 +994,7 @@ the configured default sort order."
(save-excursion (save-excursion
(let ((proc (notmuch-start-notmuch (let ((proc (notmuch-start-notmuch
"notmuch-search" buffer #'notmuch-search-process-sentinel "notmuch-search" buffer #'notmuch-search-process-sentinel
"search" "--format=sexp" "--format-version=3" "search" "--format=sexp" "--format-version=4"
(if oldest-first (if oldest-first
"--sort=oldest-first" "--sort=oldest-first"
"--sort=newest-first") "--sort=newest-first")

2
test/T310-emacs.sh
View file

@ -1015,7 +1015,7 @@ YYY/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)
=== ERROR === === ERROR ===
[XXX] [XXX]
YYY/notmuch_fail exited with status 1 YYY/notmuch_fail exited with status 1
command: YYY/notmuch_fail search --format\=sexp --format-version\=3 --sort\=newest-first tag\:inbox command: YYY/notmuch_fail search --format\=sexp --format-version\=4 --sort\=newest-first tag\:inbox
exit status: 1" exit status: 1"
test_begin_subtest "Search handles subprocess warnings" test_begin_subtest "Search handles subprocess warnings"