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

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index ac2d29ecf5491bc318ac6ed19710d55d01298ee6..24eebffa3b97699d0d566d85f8c17dc40fc69642 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -146,7 +146,7 @@ list."
   (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=json"))
+  (let ((args '("reply" "--format=json" "--format-version=1"))

        reply
        original)
     (when notmuch-show-process-crypto
        reply
        original)
     (when notmuch-show-process-crypto

diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index e7e352072887f3315a3ede255984b9db9a530006..6e9f406d5c8fddf8559d8fc666af2929b4163ede 100644 (file)
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -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
 is a possibly empty forest of replies.
 "
 list where the first element is a message, and the second element
 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
        (setq args (append args '("--decrypt"))))
     (setq args (append args search-terms))
     (if notmuch-show-process-crypto
        (setq args (append args '("--decrypt"))))
     (setq args (append args search-terms))

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index b0fd387ec0107b92c1b9642ad8e5268ec64d22f5..63387a2dfe28c85fce445dc0a1f74d63498f3d0f 100644 (file)
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -650,6 +650,10 @@ of the result."
                      (insert "Incomplete search results (search process was killed).\n"))
                  (when (eq status 'exit)
                    (insert "End of search results.\n")
                      (insert "Incomplete search results (search process was killed).\n"))
                  (when (eq status 'exit)
                    (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
                        (notmuch-check-async-exit-status proc msg)
                      ;; Suppress the error signal since strange
                    (condition-case nil
                        (notmuch-check-async-exit-status proc msg)
                      ;; Suppress the error signal since strange


@@ -935,7 +939,7 @@ Other optional parameters are used as follows:
        (let ((proc (start-process
                     "notmuch-search" buffer
                     notmuch-command "search"
        (let ((proc (start-process
                     "notmuch-search" buffer
                     notmuch-command "search"

-                    "--format=json"
+                    "--format=json" "--format-version=1"

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

diff --git a/test/emacs b/test/emacs
index 5067d67b5ad42fa75b3d03e105688d4e69a9347a..6b1896882a42052cdcbc17828bc83aaed0f76d3b 100755 (executable)
--- a/test/emacs
+++ b/test/emacs
@@ -873,7 +873,7 @@ This is output
 Error: Unexpected output from notmuch search:
 This is an error
 End of search results.
 Error: Unexpected output from notmuch search:
 This is an error
 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

diff --git a/test/emacs-show b/test/emacs-show
index 40fab61609e80b6e0bb5c612812beed2e3a53ce8..ebf530bc7bfec326938a2daf528ee79f6e82bbd6 100755 (executable)
--- a/test/emacs-show
+++ b/test/emacs-show
@@ -178,7 +178,7 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
               (with-current-buffer \"*Notmuch errors*\"
                  (test-output \"ERROR\")))"
 test_expect_equal "$(cat OUTPUT ERROR)" "\
               (with-current-buffer \"*Notmuch errors*\"
                  (test-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:
 This is an error
 Output:
 Error:
 This is an error
 Output: