Merge branch 'release'

Add back in no-display parameter by hand.

diff --cc emacs/notmuch.el
index 44519b7abc55449e3b00a5a63ef19cefc35cb7f6,46f14fea1dd0ff112a57e64154cc5e5eeb19ab37..d8d3afeb69b983312b637a20d05f145125c2f098
--- 1/emacs/notmuch.el
--- 2/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@@ -940,9 -931,9 +940,9 @@@ PROMPT is the string to prompt with.
    "Return the current query in this search buffer"
    notmuch-search-query-string)
  
- ;;;###autoload
  (put 'notmuch-search 'notmuch-doc "Search for messages.")
 -(defun notmuch-search (&optional query oldest-first target-thread target-line)
+ ;;;###autoload
 +(defun notmuch-search (&optional query oldest-first target-thread target-line no-display)
    "Display threads matching QUERY in a notmuch-search buffer.
  
  If QUERY is nil, it is read interactively from the minibuffer.