Merge branch 'release'

minimal mset fix, for 0.26.2

diff --combined NEWS
index 736d96023e27f9cdef8ea742ab48618e590d9af7,62de4b3e8bf220c88cbdbf932abf46551d9df502..2107209d79b68c069c22b968c31f76ea4fa3164c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,6 -4,12 +4,12 @@@ Notmuch 0.26.2 (UNRELEASED
  Library Changes
  ---------------
  
+ Work around Xapian bug with `get_mset(0,0, x)`.
+ 
+   This causes aborts in `_notmuch_query_count_documents` on
+   e.g. Fedora 28.  The underlying bug is fixed in Xapian commit
+   f92e2a936c1592, and will be fixed in Xapian 1.4.6.
+ 
  Make thread indexing more robust against reference loops
  
    Choose a thread root by date in case of reference loops. Fix a
@@@ -685,7 -691,7 +691,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)
  ===========================
@@@ -1045,7 -1051,7 +1051,7 @@@ Path to gpg is now configurabl
  Emacs
  -----
  
 -Avoid rendering large text attachements.
 +Avoid rendering large text attachments.
  
  Improved rendering of CID references in HTML.
  
@@@ -1086,7 -1092,7 +1092,7 @@@ Documentatio
  Sphinx is now mandatory to build docs
  
    Support for using rst2man in place of sphinx to build the
 -  docmumentation has been removed.
 +  documentation has been removed.
  
  Improved notmuch-search-terms.7
  
@@@ -1465,7 -1471,7 +1471,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.
  
@@@ -2675,7 -2681,7 +2681,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
  
@@@ -2710,7 -2716,7 +2716,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 4e6cda69976eaaafe62450fcba1bdbfb7e9900c6,1a0b8bea68119c56d61b8ceb68d492d938a5d3b9..2a05152f5dbc92900d2315e4e532ccb42835f54e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,10 +1,10 @@@
+ notmuch (0.26.2-1) UNRELEASED; urgency=medium
+ 
+   * Break reference loops when indexing, fixes INTERNAL_ERROR in "notmuch show"
+   * Don't call get_mset(0,0,X), fixes crash on some gcc8 using distros
+ 
+  -- David Bremner <bremner@debian.org>  Thu, 26 Apr 2018 22:41:37 -0300
+ 
  notmuch (0.26.1-1) unstable; urgency=medium
  
    * Bump LIBRARY_MINOR_VERSION to 1, for new functions in 0.26
@@@ -535,7 -542,7 +542,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
  
@@@ -956,7 -963,7 +963,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).