Merge branch 'release'

A point release is slowly being built on branch release. Merge those
changes into master.

diff --combined Makefile.local
index fa07d81bb097701f20122f9470cae3681d1b7339,4f8f4640e8325b25bfa1a60138e4bfe5b365b3cb..af79b5c7348c830055844f5463d50280c4bc0259
--- 1/Makefile.local
--- 2/Makefile.local
+++ b/Makefile.local
@@@ -21,7 -21,7 +21,7 @@@ endi
  VERSION:=$(shell cat ${srcdir}/version)
  ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
  ifeq ($(IS_GIT),yes)
 -VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
 +VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
  # Write the file 'version.stamp' in case its contents differ from $(VERSION)
  FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
  ifneq ($(FILE_VERSION),$(VERSION))
@@@ -46,15 -46,16 +46,16 @@@ PV_FILE=bindings/python/notmuch/version
  # Smash together user's values with our extra values
  FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
  FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
- FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS)
+ FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
+ ifeq ($(LIBDIR_IN_LDCONFIG),0)
+ FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
+ endif
+ FINAL_NOTMUCH_LDFLAGS += $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS)
  FINAL_NOTMUCH_LINKER = CC
  ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
  FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
  FINAL_NOTMUCH_LINKER = CXX
  endif
- ifeq ($(LIBDIR_IN_LDCONFIG),0)
- FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
- endif
  FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS)
  
  .PHONY: all

diff --combined emacs/notmuch.el
index 8aa01049e9be7ddd312f02e756850a9f29ab1aa0,1adea9c2c7d6fccf9e863d026745971185c3859b..f6bf9c84d6a9cc4c86c647237d668e5a60784daf
--- 1/emacs/notmuch.el
--- 2/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@@ -428,14 -428,16 +428,16 @@@ matched and unmatched messages in the c
    "Return the stable query for the current region.
  
  If ONLY-MATCHED is non-nil, include only matched messages.  If it
- is nil, include both matched and unmatched messages."
+ is nil, include both matched and unmatched messages. If there are
+ no messages in the region then return nil."
    (let ((query-list nil) (all (not only-matched)))
      (dolist (queries (notmuch-search-properties-in-region :query beg end))
        (when (first queries)
        (push (first queries) query-list))
        (when (and all (second queries))
        (push (second queries) query-list)))
-     (concat "(" (mapconcat 'identity query-list ") or (") ")")))
+     (when query-list
+       (concat "(" (mapconcat 'identity query-list ") or (") ")"))))
  
  (defun notmuch-search-find-authors ()
    "Return the authors for the current thread"
@@@ -647,12 -649,12 +649,12 @@@ of the result.
  Here is an example of how to color search results based on tags.
   (the following text would be placed in your ~/.emacs file):
  
 - (setq notmuch-search-line-faces '((\"deleted\" . (:foreground \"red\"
 -                                                :background \"blue\"))
 -                                   (\"unread\" . (:foreground \"green\"))))
 + (setq notmuch-search-line-faces '((\"unread\" . (:foreground \"green\"))
 +                                   (\"deleted\" . (:foreground \"red\"
 +                                                :background \"blue\"))))
  
 -The attributes defined for matching tags are merged, with later
 -attributes overriding earlier. A message having both \"deleted\"
 +The attributes defined for matching tags are merged, with earlier
 +attributes overriding later. A message having both \"deleted\"
  and \"unread\" tags with the above settings would have a green
  foreground and blue background."
    :type '(alist :key-type (string) :value-type (custom-face-edit))