[PATCH] cli: enable notmuch --help command

[PATCH] cli: enable notmuch --help command

[David Bremner]

This functionality seems to have been undocumented, if it ever
existed. Document it now.
---
 doc/man1/notmuch.rst | 4 +++-
 notmuch.c            | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index ae0461a..87fb7bc 100644
--- a/doc/man1/notmuch.rst
+++ b/doc/man1/notmuch.rst
@@ -39,8 +39,10 @@ OPTIONS
 
 Supported global options for ``notmuch`` include
 
-    ``--help``
+    ``--help`` [command-name]
         Print a synopsis of available commands and exit.
+        With an optional command name, show the man page
+        for that subcommand.
 
     ``--version``
         Print the installed version of notmuch, and exit.
diff --git a/notmuch.c b/notmuch.c
index c528dce..9580c3f 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -381,11 +381,11 @@ main (int argc, char *argv[])
 	goto DONE;
     }
 
-    notmuch_process_shared_options (NULL);
-
     if (opt_index < argc)
 	command_name = argv[opt_index];
 
+    notmuch_process_shared_options (command_name);
+
     command = find_command (command_name);
     if (!command) {
 	fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
-- 
2.1.4

Re: [PATCH] cli: enable notmuch --help command

[David Bremner]

David Bremner <david@tethera.net> writes:

> This functionality seems to have been undocumented, if it ever
> existed. Document it now.

Apparently this is a patch that fixes our currently broken subtest. That
might have even been why I wrote it. I'll push (a whitespace cleaned up
version of) this unless I hear some objections.

d

Re: [PATCH] cli: enable notmuch --help command

[David Bremner]

David Bremner <david@tethera.net> writes:

> David Bremner <david@tethera.net> writes:
>
>> This functionality seems to have been undocumented, if it ever
>> existed. Document it now.
>
> Apparently this is a patch that fixes our currently broken subtest. That
> might have even been why I wrote it. I'll push (a whitespace cleaned up
> version of) this unless I hear some objections.

As threatened, I pushed this.

d