emacs: convert remaining format-versions from 3 to 4

This is needed for consistent beheviour between notmuch built against
gmime-2.6 and gmime-3.0 w.r.t. error reporting.

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index 74a4584f64130b1242011c96a70f2c84c2c78dd9..f937e708406bbb73c3c9f164a904385c2e5cf91b 100644 (file)
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -317,7 +317,7 @@ execution, CALLBACK is called when harvesting finishes."
                            (when config-query
                              (format " and (%s)" config-query)))
                  from-or-to-me-query))
                            (when config-query
                              (format " and (%s)" config-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")
                 "--deduplicate=address"
                 ,query)))
                 ,(if sent "--output=recipients" "--output=sender")
                 "--deduplicate=address"
                 ,query)))

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index ddfb981135c868053d05f1cdf53bfc1e26fc647d..fd64b362b542b9bef5c169c29fb52ba2128c4f4e 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -176,7 +176,7 @@ mutiple parts get a header."
   (unless (bolp) (insert "\n")))
 
 (defun notmuch-mua-reply (query-string &optional sender reply-all)
   (unless (bolp) (insert "\n")))
 
 (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)
        reply
        original)
        (process-crypto notmuch-show-process-crypto)
        reply
        original)

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 55212626307704a5743ef94f93f0750add7a07c7..022525aec0f5d45c97dbb1079016fab58d1ab17d 100644 (file)
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -917,7 +917,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
     (notmuch-tag-clear-cache)
     (let ((proc (notmuch-start-notmuch
                 "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))
          ;; Use a scratch buffer to accumulate partial output.
          ;; This buffer will be killed by the sentinel, which
                 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 bd503a1108d5eb616a0c731d0d589c4ab46bf778..0aeff560fdfc5de08630be749d4d7e4a1689f89a 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -994,7 +994,7 @@ the configured default sort order."
       (save-excursion
        (let ((proc (notmuch-start-notmuch
                     "notmuch-search" buffer #'notmuch-search-process-sentinel
       (save-excursion
        (let ((proc (notmuch-start-notmuch
                     "notmuch-search" buffer #'notmuch-search-process-sentinel

-                    "search" "--format=sexp" "--format-version=3"
+                    "search" "--format=sexp" "--format-version=4"

                     (if oldest-first
                         "--sort=oldest-first"
                       "--sort=newest-first")
                     (if oldest-first
                         "--sort=oldest-first"
                       "--sort=newest-first")

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index c8a25de2263498cc2fffb768c3f4ae596f57fc30..fde11790a600ae3591803a3f820bcb42516e798f 100755 (executable)
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -1015,7 +1015,7 @@ YYY/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)
 === ERROR ===
 [XXX]
 YYY/notmuch_fail exited with status 1
 === ERROR ===
 [XXX]
 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"
 
 test_begin_subtest "Search handles subprocess warnings"
 exit status: 1"
 
 test_begin_subtest "Search handles subprocess warnings"