From: David Bremner <david@tethera.net>
Date: Sat, 13 May 2017 11:51:10 +0000 (-0300)
Subject: Merge branch 'release'
X-Git-Tag: 0.25_rc0~70
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=523d2b50fcaae90cbe09975c1f1bc652ff521ec6;hp=30c475c1ef3d6823ed9ab0affc30328726c5240f

Merge branch 'release'

Emacs bug fix from Mark
---

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 7bebdbab..d4d40761 100644
--- 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