From: David Bremner <david@tethera.net>
Date: Thu, 15 Dec 2016 12:57:10 +0000 (+0900)
Subject: Merge branch 'release'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5de84d07526d330a46e50d955bdfeed8f629637d;p=notmuch.git

Merge branch 'release'

Add back in no-display parameter by hand.
---

5de84d07526d330a46e50d955bdfeed8f629637d
diff --cc emacs/notmuch.el
index 44519b7a,46f14fea..d8d3afeb
--- a/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.")
+ ;;;###autoload
 -(defun notmuch-search (&optional query oldest-first target-thread target-line)
 +(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.