From: David Bremner <david@tethera.net>
Date: Wed, 26 Jul 2017 14:02:16 +0000 (-0400)
Subject: Merge tag 'debian/0.25-1'
X-Git-Tag: 0.26_rc0~224
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=d663706055a275ccf8e0098ef44c336d028b7e7f;hp=9f648dfbb8e253dab1bc4a0e761ad46cec405f4d;p=notmuch

Merge tag 'debian/0.25-1'

notmuch Debian 0.25-1 upload (same as 0.25)
---

diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 0aeff560..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))