Merge branch 'release'

Conflicts:
        NEWS

Add in NEWS from point release

diff --cc NEWS
index 0465b9e8e89cf2dfcbc1de49b67f8430ab08b914,a2ae2691fd5b987674286298bcaa7e9e98afe7f3..d720c1e0cf363ed29e31c8d7ad73535ab36f787b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,33 -1,20 +1,50 @@@
 +Notmuch 0.26 (UNRELEASED)
 +=========================
 +
 +Test Suite
 +----------
 +
 +Out-of-tree builds
 +
 +  The test suite now works properly with out-of-tree builds, i.e. with
 +  separate source and build directories. The --root option to tests
 +  has been dropped. The same can now be achieved more reliably using
 +  out-of-tree builds.
 +
 +Encrypted Mail
 +--------------
 +
 +Indexing cleartext of encrypted e-mails
 +
 +  It's now possible to include the cleartext of encrypted e-mails in
 +  the notmuch index.  This makes it possible to search your encrypted
 +  e-mails with the same ease as searching cleartext.  This can be done
 +  on a per-message basis with the --decrypt argument to indexing
 +  commands (new, insert, reindex), or by default by running "notmuch
 +  config set index.decrypt true".
 +
 +  Note that the contents of the index are sufficient to roughly
 +  reconstruct the cleartext of the message itself, so please ensure
 +  that the notmuch index itself is adequately protected.  DO NOT USE
 +  this feature without considering the security of your index.
 +
+ Notmuch 0.25.3 (2017-12-08)
+ ===========================
+ 
+ Emacs
+ -----
+ 
+ Extend mitigation (disabling handling x-display in text/enriched) for
+ Emacs bug #28350 to Emacs versions before 24.4 (i.e. without
+ `advice-add`).
+ 
+ Command Line Interface
+ ----------------------
+ 
+ Correctly report userid validity. Fix test suite failure for GMime >=
+ 3.0.3. This change raises the minimum supported version of GMime 3.x
+ to 3.0.3.
+ 
  Notmuch 0.25.2 (2017-11-05)
  ===========================
  

diff --cc configure
Simple merge

diff --cc debian/changelog
Simple merge

diff --cc debian/control
Simple merge

diff --cc emacs/notmuch-show.el
Simple merge

diff --cc notmuch-show.c
Simple merge

diff --cc test/T355-smime.sh
Simple merge

diff --cc test/T450-emacs-show.sh
Simple merge

diff --cc util/gmime-extra.h
index 40bf1454d00dfee0496fd186b60db9a03c1d93c4,18888b5545df2405f76e2f24f6d08ec0db2af9b9..ca822b8cf53b4e0b1b0509b3dcb5d4d92d46ca54
--- 1/util/gmime-extra.h
--- 2/util/gmime-extra.h
+++ b/util/gmime-extra.h
@@@ -16,11 -16,10 +16,9 @@@ GMimeStream *g_mime_stream_stdout_new(v
  #define g_mime_2_6_unref(obj) g_object_unref (obj)
  #define g_mime_3_unused(arg) arg
  #define g_mime_certificate_get_fpr16(cert) g_mime_certificate_get_key_id (cert)
- #define g_mime_certificate_get_uid(cert) g_mime_certificate_get_name (cert);
  #else /* GMime >= 3.0 */
 -typedef GMimeAddressType GMimeRecipientType;
  
  #define GMIME_ENABLE_RFC_2047_WORKAROUNDS 0xdeadbeef
- #define g_mime_certificate_get_uid(cert) g_mime_certificate_get_key_id (cert);
  #define g_mime_content_type_to_string(c) g_mime_content_type_get_mime_type (c)
  #define g_mime_filter_crlf_new(encode,dots) g_mime_filter_dos2unix_new (FALSE)
  #define g_mime_gpg_context_new(func,path) g_mime_gpg_context_new ()