X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch.el;h=44402f8aa8256b55816b9a256b6b7f7468e54e9d;hb=ef07e3f3bdd01a7266e0268227cd9b78f3c47c68;hp=bd503a1108d5eb616a0c731d0d589c4ab46bf778;hpb=b6f87c3085e25e5bf65a4f956af8846bc0681c52;p=notmuch

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index bd503a11..44402f8a 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -49,7 +49,20 @@
 ;; Have fun, and let us know if you have any comment, questions, or
 ;; kudos: Notmuch list <notmuch@notmuchmail.org> (subscription is not
 ;; required, but is available from https://notmuchmail.org).
-
+;;
+;; Note for MELPA users (and others tracking the development version
+;; of notmuch-emacs):
+;;
+;; This emacs package needs a fairly closely matched version of the
+;; notmuch program. If you use the MELPA version of notmuch.el (as
+;; opposed to MELPA stable), you should be prepared to track the
+;; master development branch (i.e. build from git) for the notmuch
+;; program as well. Upgrading notmuch-emacs too far beyond the notmuch
+;; program can CAUSE YOUR EMAIL TO STOP WORKING.
+;;
+;; TL;DR: notmuch-emacs from MELPA and notmuch from distro packages is
+;; NOT SUPPORTED.
+;;
 ;;; Code:
 
 (eval-when-compile (require 'cl))
@@ -994,7 +1007,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=3"
+		     "search" "--format=sexp" "--format-version=4"
 		     (if oldest-first
 			 "--sort=oldest-first"
 		       "--sort=newest-first")