Merge branch 'release'

Emacs bug fix from Mark

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 7bebdbabb6cc492997f6afee04e0e1077365efae..d4d407616deec11d9f278ccbfa5b03f0cd11972c 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"
+                "show" "--body=false" "--format=sexp" "--format-version=2"
                 message-arg search-args))
          ;; Use a scratch buffer to accumulate partial output.
          ;; This buffer will be killed by the sentinel, which