[PATCH 1/3] man: document external subcommand handling in notmuch(1)

[PATCH 1/3] man: document external subcommand handling in notmuch(1)

[Jani Nikula]

The documentation for this was overlooked when adding the subcommand
handling. This seems like the proper place for it.
---
 doc/man1/notmuch.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index 7429f517626d..fbd7f3816757 100644
--- a/doc/man1/notmuch.rst
+++ b/doc/man1/notmuch.rst
@@ -116,6 +116,15 @@ dump of email tags for backup purposes, and to restore from that dump.
 The **config** command can be used to get or set settings in the notmuch
 configuration file.
 
+CUSTOM COMMANDS
+---------------
+
+If the given command is not known to notmuch, notmuch tries to execute
+the external **notmuch-<subcommand>** in ${PATH} instead. This allows
+users to have their own notmuch related tools to be run via the
+notmuch command. By design, this does not allow notmuch's own commands
+to be overriden using external commands.
+
 ENVIRONMENT
 ===========
 
-- 
2.11.0

[PATCH 2/3] NEWS: external subcommand handling

[Jani Nikula]

---
 NEWS | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/NEWS b/NEWS
index 652affa960ed..079308555935 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,15 @@ Regular expression searches supported for `from:` and `subject:`.
   This requires recent Xapian (1.4+) See notmuch-search-terms(7) for
   details.
 
+Command Line Interface
+----------------------
+
+Run external `notmuch-` prefixed commands as subcommands
+
+  You can now add your own `notmuch-` prefixed commands in PATH, and
+  have notmuch run them as if they were notmuch commands. See the
+  `notmuch(1)` man page for details
+
 Emacs Interface
 ---------------
 
-- 
2.11.0

[PATCH 3/3] NEWS: notmuch-emacs-mua and desktop integration

[Jani Nikula]

---
 NEWS | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/NEWS b/NEWS
index 079308555935..aa43b5ca4638 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,22 @@ Emacs Interface
 
   Save and resume messages in `notmuch-message-mode` (composition).
 
+`notmuch emacs-mua` command installed with the Emacs interface
+
+  We've carried a `notmuch-emacs-mua` script in the source tree for
+  quite some time. It can be used to launch the Notmuch Emacs
+  interface from the command line in many different ways. Starting
+  with this release, it will be installed with the Emacs
+  interface. With the new external subcommand support, the script
+  transparently becomes a new notmuch command. See the
+  `notmuch-emacs-mua(1)` man page for details.
+
+Notmuch Emacs desktop integration
+
+  The desktop integration file will now be installed with the Notmuch
+  Emacs interface, adding a Notmuch menu item and configuration to
+  allow the user to set up Notmuch Emacs as the `mailto:` URL handler.
+
 Library changes
 ---------------
 
-- 
2.11.0

Re: [PATCH 1/3] man: document external subcommand handling in notmuch(1)

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> The documentation for this was overlooked when adding the subcommand
> handling. This seems like the proper place for it.

I have applied this series to master and release. Note that there were
some conflicts with Mark's NEWS patch so please double check my
conflict resolution.

d