--- /dev/null
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 1CCC1431FC9\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 11:11:52 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id EA2XGB4XoSTN for <notmuch@notmuchmail.org>;\r
+ Mon, 14 Apr 2014 11:11:48 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id B5C37431FBD\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 11:11:48 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+ id C76881000C1; Mon, 14 Apr 2014 21:11:42 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] NEWS: notmuch-init-file and notmuch-emacs-version related\r
+ news\r
+Date: Mon, 14 Apr 2014 21:11:40 +0300\r
+Message-Id: <1397499100-24552-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 14 Apr 2014 18:11:52 -0000\r
+\r
+Along with those, removed trailing space from subsection title.\r
+\r
+---\r
+\r
+This is to be applied on top of\r
+\r
+ id:1397306787-12207-3-git-send-email-markwalters1009@gmail.com\r
+\r
+ NEWS | 16 +++++++++++++++-\r
+ 1 file changed, 15 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index f1d5499..338f8de 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -4,7 +4,7 @@ Notmuch 0.18 (UNRELEASED)\r
+ Command-Line Interface\r
+ ----------------------\r
+ \r
+-`notmuch dump` now defaults to `batch-tag` format.\r
++`notmuch dump` now defaults to `batch-tag` format\r
+ \r
+ The old format is still available with `--format=sup`.\r
+ \r
+@@ -15,6 +15,14 @@ Command-Line Interface\r
+ Emacs Interface\r
+ ---------------\r
+ \r
++Init file\r
++\r
++ If the file pointed by new variable `notmuch-init-file` (typically\r
++ `~/.emacs.d/notmuch-config.el`) exists, it is loaded at the end of\r
++ `notmuch.el`.Users can put their personal notmuch emacs lisp based\r
++ configuration/customization items there instead of filling\r
++ `~/.emacs` with these.\r
++\r
+ Changed format for saved searches\r
+ \r
+ The format for `notmuch-saved-searches` has changed, but old style\r
+@@ -38,6 +46,12 @@ Changed format for saved searches\r
+ saved-search :name) and (cdr saved-search) by\r
+ (notmuch-saved-search-get saved-search :query) should be sufficient.\r
+ \r
++Version variable\r
++\r
++ The new, build-time generated variable `notmuch-emacs-version` is used\r
++ to distinguish between notmuch cli and notmuch emacs versions.\r
++ This is especially useful when using notmuch remotely.\r
++\r
+ Bug fix for saved searches with newlines in them\r
+ \r
+ Split lines confuse `notmuch count --batch`, so we remove embedded\r
+-- \r
+1.8.0\r
+\r