Merge branch 'release'

diff --combined NEWS
index 17dba0194344049b9323c2344ad866e430fa3ddb,39ce77072fdba842d440eea808b801c041ca9c94..fff8a08c6acc3244aa9aa3a38f374badd6d31eda
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,3 -1,13 +1,13 @@@
+ Notmuch 0.26.1 (2018-04-02)
+ ===========================
+ 
+ Library Changes
+ ---------------
+ 
+ Bump the library minor version. This should have happened in 0.26, but
+ better late than never.
+ 
+ 
  Notmuch 0.26 (2018-01-09)
  =========================
  
@@@ -664,7 -674,7 +674,7 @@@ Fixed constant values so they are not a
    Previously, it was impossible to open writable database handles,
    because `DATABASE_MODE_READ_ONLY` and `DATABASE_MODE_READ_WRITE` were
    both set to zero.
 -  The same issue occured with sort modes.
 +  The same issue occurred with sort modes.
  
  Notmuch 0.22.2 (2016-09-08)
  ===========================
@@@ -1444,7 -1454,7 +1454,7 @@@ Command-Line Interfac
  The commands set consistent exit status codes on failures
  
    The cli commands now consistently set exit status of 1 on failures,
 -  except where explicitly otherwise noted. The notable expections are
 +  except where explicitly otherwise noted. The notable exceptions are
    the status codes for format version mismatches for commands that
    support formatted output.
  
@@@ -2654,7 -2664,7 +2664,7 @@@ Turn "id:MSG-ID" links into buttons ass
  
  Add keybinding ('c I') for stashing Message-ID's without an id: prefix
  
 -  Reduces manual labour when stashing them for use outside notmuch.
 +  Reduces manual labor when stashing them for use outside notmuch.
  
  Do not query on `notmuch-search` exit
  
@@@ -2689,7 -2699,7 +2699,7 @@@ mailing list
  nmbug - share tags with a given prefix
  
    nmbug helps maintain a git repo containing all tags with a given
 -  prefix (by default "notmuch::"). Tags can be shared by commiting
 +  prefix (by default "notmuch::"). Tags can be shared by committing
    them to git in one location and restoring in another.
  
  Notmuch 0.9 (2011-10-01)

diff --combined debian/changelog
index 28c8f636d54311a630bf5ca2c201b9f4f1085723,0bc2d7bb4335227946a7b418e6fe7aa253cefa22..4e6cda69976eaaafe62450fcba1bdbfb7e9900c6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
+ notmuch (0.26.1-1) unstable; urgency=medium
+ 
+   * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26
+ 
+  -- David Bremner <bremner@debian.org>  Mon, 02 Apr 2018 08:08:01 -0300
+ 
  notmuch (0.26-1) unstable; urgency=medium
  
    [ Daniel Kahn Gillmor ]
@@@ -529,7 -535,7 +535,7 @@@ notmuch (0.18-3) unstable; urgency=medi
  notmuch (0.18-2) unstable; urgency=medium
  
    * Disable atomicity tests on armhf. These should be re-enabled when
 -    upstream relases a fix for this (in progress).
 +    upstream releases a fix for this (in progress).
  
   -- David Bremner <bremner@debian.org>  Thu, 08 May 2014 08:28:33 +0900
  
@@@ -950,7 -956,7 +956,7 @@@ notmuch (0.6.1-1) unstable; urgency=lo
  notmuch (0.6) unstable; urgency=low
  
    * New upstream release; see /usr/share/doc/notmuch/NEWS for
 -    details. Hilights include:
 +    details. Highlights include:
      - Folder-based search (Closes: #597222)
      - PGP/MIME decryption and verification
    * Document strict dependency on emacs23 (Closes: #631994).

diff --combined lib/notmuch.h
index 7275d27000a57224694dfe21afab07a3258d456d,ab5854d7273d69186664d37abfb3941d96d41a91..4db28a051e9f8f10c64045c617faf5e0914b05ba
--- 1/lib/notmuch.h
--- 2/lib/notmuch.h
+++ b/lib/notmuch.h
@@@ -58,7 -58,7 +58,7 @@@ NOTMUCH_BEGIN_DECL
   * version in Makefile.local.
   */
  #define LIBNOTMUCH_MAJOR_VERSION      5
- #define LIBNOTMUCH_MINOR_VERSION      0
+ #define LIBNOTMUCH_MINOR_VERSION      1
  #define LIBNOTMUCH_MICRO_VERSION      0
  
  
@@@ -869,7 -869,7 +869,7 @@@ notmuch_query_get_sort (const notmuch_q
   *
   * NOTMUCH_STATUS_SUCCESS: excluded was added successfully.
   *
 - * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured.
 + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occurred.
   *      Most likely a problem lazily parsing the query string.
   *
   * NOTMUCH_STATUS_IGNORED: tag is explicitly present in the query, so
@@@ -1065,7 -1065,7 +1065,7 @@@ notmuch_threads_destroy (notmuch_thread
   *
   * NOTMUCH_STATUS_SUCCESS: query completed successfully.
   *
 - * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. The
 + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occurred. The
   *      value of *count is not defined.
   *
   * @since libnotmuch 5 (notmuch 0.25)
@@@ -1101,7 -1101,7 +1101,7 @@@ notmuch_query_count_messages_st (notmuc
  
   * NOTMUCH_STATUS_SUCCESS: query completed successfully.
   *
 - * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occured. The
 + * NOTMUCH_STATUS_XAPIAN_EXCEPTION: a Xapian exception occurred. The
   *      value of *count is not defined.
   *
   * @since libnotmuch 5 (notmuch 0.25)
@@@ -1778,7 -1778,7 +1778,7 @@@ notmuch_message_destroy (notmuch_messag
   *
   * @returns
   * - NOTMUCH_STATUS_NULL_POINTER: *value* may not be NULL.
 - * - NOTMUCH_STATUS_SUCCESS: No error occured.
 + * - NOTMUCH_STATUS_SUCCESS: No error occurred.
   * @since libnotmuch 4.4 (notmuch 0.23)
   */
  notmuch_status_t
@@@ -1790,7 -1790,7 +1790,7 @@@ notmuch_message_get_property (notmuch_m
   * @returns
   * - NOTMUCH_STATUS_ILLEGAL_ARGUMENT: *key* may not contain an '=' character.
   * - NOTMUCH_STATUS_NULL_POINTER: Neither *key* nor *value* may be NULL.
 - * - NOTMUCH_STATUS_SUCCESS: No error occured.
 + * - NOTMUCH_STATUS_SUCCESS: No error occurred.
   * @since libnotmuch 4.4 (notmuch 0.23)
   */
  notmuch_status_t
@@@ -1804,7 -1804,7 +1804,7 @@@ notmuch_message_add_property (notmuch_m
   * @returns
   * - NOTMUCH_STATUS_ILLEGAL_ARGUMENT: *key* may not contain an '=' character.
   * - NOTMUCH_STATUS_NULL_POINTER: Neither *key* nor *value* may be NULL.
 - * - NOTMUCH_STATUS_SUCCESS: No error occured.
 + * - NOTMUCH_STATUS_SUCCESS: No error occurred.
   * @since libnotmuch 4.4 (notmuch 0.23)
   */
  notmuch_status_t
@@@ -1819,7 -1819,7 +1819,7 @@@ notmuch_message_remove_property (notmuc
   * @returns
   * - NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in
   *   read-only mode so message cannot be modified.
 - * - NOTMUCH_STATUS_SUCCESS: No error occured.
 + * - NOTMUCH_STATUS_SUCCESS: No error occurred.
   *
   * @since libnotmuch 4.4 (notmuch 0.23)
   */
@@@ -1835,7 -1835,7 +1835,7 @@@ notmuch_message_remove_all_properties (
   * @returns
   * - NOTMUCH_STATUS_READ_ONLY_DATABASE: Database was opened in
   *   read-only mode so message cannot be modified.
 - * - NOTMUCH_STATUS_SUCCESS: No error occured.
 + * - NOTMUCH_STATUS_SUCCESS: No error occurred.
   *
   * @since libnotmuch 5.1 (notmuch 0.26)
   */