diff options
| author | David Bremner <david@tethera.net> | 2021-08-21 17:00:11 -0700 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-08-22 07:05:13 -0700 |
| commit | 731697d671749a13634a2a4b843ce62f2927f64f (patch) | |
| tree | 754e93c78844e7fd798770157a3eb005bb7b157c /emacs | |
| parent | 357dd488caf0262f8a36ea4fd23b9d017cc93440 (diff) | |
CLI: define and use format version 5
This is a bit of a cheat, since the format does not actually
change. On the other hand it is fairly common to do something like
this to shared libary SONAMEs when the ABI changes in some subtle way.
It does rely on the format-version argument being early enough on the
command line to generate a sensible error message.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-address.el | 2 | ||||
| -rw-r--r-- | emacs/notmuch-mua.el | 2 | ||||
| -rw-r--r-- | emacs/notmuch-query.el | 2 | ||||
| -rw-r--r-- | emacs/notmuch-tree.el | 2 | ||||
| -rw-r--r-- | emacs/notmuch.el | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el index f0af6667..9fc13bc5 100644 --- a/emacs/notmuch-address.el +++ b/emacs/notmuch-address.el @@ -308,7 +308,7 @@ execution, CALLBACK is called when harvesting finishes." (and config-query (format " and (%s)" config-query))) from-or-to-me-query)) - (args `("address" "--format=sexp" "--format-version=4" + (args `("address" "--format=sexp" "--format-version=5" ,(if sent "--output=recipients" "--output=sender") "--deduplicate=address" ,query))) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index 17954fb3..f510c043 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -235,7 +235,7 @@ Typically this is added to `notmuch-mua-send-hook'." ;;; Mua reply (defun notmuch-mua-reply (query-string &optional sender reply-all) - (let ((args '("reply" "--format=sexp" "--format-version=4")) + (let ((args '("reply" "--format=sexp" "--format-version=5")) (process-crypto notmuch-show-process-crypto) reply original) diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el index d7349b77..5c7f4f8d 100644 --- a/emacs/notmuch-query.el +++ b/emacs/notmuch-query.el @@ -31,7 +31,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 is a possibly empty forest of replies." - (let ((args '("show" "--format=sexp" "--format-version=4"))) + (let ((args '("show" "--format=sexp" "--format-version=5"))) (when notmuch-show-process-crypto (setq args (append args '("--decrypt=true")))) (setq args (append args search-terms)) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index 01a77b71..2f508128 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -1103,7 +1103,7 @@ the same as for the function notmuch-tree." (notmuch-tag-clear-cache) (let ((proc (notmuch-start-notmuch "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel - "show" "--body=false" "--format=sexp" "--format-version=4" + "show" "--body=false" "--format=sexp" "--format-version=5" sort-arg message-arg search-args)) ;; Use a scratch buffer to accumulate partial output. ;; This buffer will be killed by the sentinel, which diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 351334aa..739cb93b 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -1020,7 +1020,7 @@ the configured default sort order." (save-excursion (let ((proc (notmuch-start-notmuch "notmuch-search" buffer #'notmuch-search-process-sentinel - "search" "--format=sexp" "--format-version=4" + "search" "--format=sexp" "--format-version=5" (if oldest-first "--sort=oldest-first" "--sort=newest-first") |