emacs: convert to use format-version 3

Keeping the emacs interface running old format-versions makes it
impossible to test new format-versions or deprecate old ones.

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index d504ff2d9fd4e0a952116761104a28fb1a1d2602..74a4584f64130b1242011c96a70f2c84c2c78dd9 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))
-        (args `("address" "--format=sexp" "--format-version=2"
+        (args `("address" "--format=sexp" "--format-version=3"
                 ,(if sent "--output=recipients" "--output=sender")
                 "--deduplicate=address"
                 ,query)))

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 93747b1cb280c94ded422145b04a94094cf76dd9..ddfb981135c868053d05f1cdf53bfc1e26fc647d 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)
-  (let ((args '("reply" "--format=sexp" "--format-version=1"))
+  (let ((args '("reply" "--format=sexp" "--format-version=3"))
        (process-crypto notmuch-show-process-crypto)
        reply
        original)

diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index 436ad160a05b8c0f9a698de1ba9fb025fc272912..48acb551300a096804adba87e55b65cbf55c2053 100644 (file)
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -30,7 +30,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=1")))
+  (let ((args '("show" "--format=sexp" "--format-version=3")))
     (if notmuch-show-process-crypto
        (setq args (append args '("--decrypt"))))
     (setq args (append args search-terms))

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index aafdd3d77282af3ade478c7c6d65f1951e483b0d..1cbcc132030a67c347938b943d70beb2fd67a59e 100644 (file)
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1677,9 +1677,10 @@ current thread."
 
 ;; dme: Would it make sense to use a macro for many of these?
 
+;; XXX TODO figure out what to do about multiple filenames
 (defun notmuch-show-get-filename ()
   "Return the filename of the current message."
-  (notmuch-show-get-prop :filename))
+  (car (notmuch-show-get-prop :filename)))
 
 (defun notmuch-show-get-header (header &optional props)
   "Return the named header of the current message, if any."

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index d4d407616deec11d9f278ccbfa5b03f0cd11972c..6812d7e9204e5918d377b02a4298d099cb6b90a1 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
-                "show" "--body=false" "--format=sexp" "--format-version=2"
+                "show" "--body=false" "--format=sexp" "--format-version=3"
                 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 90af68e399b966da5a97f1718b42e9ba1a0a849e..bd503a1108d5eb616a0c731d0d589c4ab46bf778 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
-                    "search" "--format=sexp" "--format-version=2"
+                    "search" "--format=sexp" "--format-version=3"
                     (if oldest-first
                         "--sort=oldest-first"
                       "--sort=newest-first")

diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index ef5998496535310d0447d9485593a919e5036438..8a8819416a59e8cb8b117fea76e6f7e8d1793438 100755 (executable)
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -1014,7 +1014,7 @@ YYY/notmuch_fail exited with status 1 (see *Notmuch errors* for more details)
 === ERROR ===
 [XXX]
 YYY/notmuch_fail exited with status 1
-command: YYY/notmuch_fail search --format\=sexp --format-version\=2 --sort\=newest-first tag\:inbox
+command: YYY/notmuch_fail search --format\=sexp --format-version\=3 --sort\=newest-first tag\:inbox
 exit status: 1"
 
 test_begin_subtest "Search handles subprocess warnings"

diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh
index 74d546bd2c455afb9da6079c66c4feb0eb2d17f4..d302efb68fb383e986638538816919ddee100cc5 100755 (executable)
--- a/test/T450-emacs-show.sh
+++ b/test/T450-emacs-show.sh
@@ -191,7 +191,7 @@ This is an error (see *Notmuch errors* for more details)
 === ERROR ===
 [XXX]
 This is an error
-command: YYY/notmuch_fail show --format\\=sexp --format-version\\=1 --exclude\\=false \\' \\* \\'
+command: YYY/notmuch_fail show --format\\=sexp --format-version\\=3 --exclude\\=false \\' \\* \\'
 exit status: 1
 stderr:
 This is an error