debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source 
Add back in no-display parameter by hand.
This commit is contained in:
David Bremner 2016-12-15 21:57:10 +09:00
commit 5de84d0752
3 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
NEWS
View file

@ -1,3 +1,20 @@
Notmuch 0.23.4 (UNRELEASED)
===========================
Command Line Interface
----------------------
Improve error handling in notmuch insert
Database lock errors no longer prevent message file delivery to the
filesystem. Certain errors during `notmuch insert` most likely to
be temporary return EX_TEMPFAIL.
Emacs
-----
Restore autoload cookie for notmuch-search.
Notmuch 0.23.3 (2016-11-27) Notmuch 0.23.3 (2016-11-27)
=========================== ===========================

7
doc/man1/notmuch-insert.rst
View file

@ -60,6 +60,13 @@ indexing to Notmuch database, changing tags, and synchronizing tags to
maildir flags. The ``--keep`` option may be used to settle for maildir flags. The ``--keep`` option may be used to settle for
successful message file delivery. successful message file delivery.
This command supports the following special exit status code for
errors most likely to be temporary in nature, e.g. failure to get a
database write lock.
``75 (EX_TEMPFAIL)``
A temporary failure occured; the user is invited to retry.
The exit status of the **post-insert** hook does not affect the exit The exit status of the **post-insert** hook does not affect the exit
status of the **insert** command. status of the **insert** command.

2
emacs/notmuch.el
View file

@ -940,8 +940,8 @@ PROMPT is the string to prompt with."
"Return the current query in this search buffer" "Return the current query in this search buffer"
notmuch-search-query-string) notmuch-search-query-string)
;;;###autoload
(put 'notmuch-search 'notmuch-doc "Search for messages.") (put 'notmuch-search 'notmuch-doc "Search for messages.")
;;;###autoload
(defun notmuch-search (&optional query oldest-first target-thread target-line no-display) (defun notmuch-search (&optional query oldest-first target-thread target-line no-display)
"Display threads matching QUERY in a notmuch-search buffer. "Display threads matching QUERY in a notmuch-search buffer.