cli: enable notmuch --help command

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

diff --git a/doc/man1/notmuch.rst b/doc/man1/notmuch.rst
index d773369ecb4a82a3dc509d018f9325339568a893..0401c91bea89d3a0381eee37c2d59064ac69ec8c 100644 (file)
--- 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 c528dce2d12100b66d9dffd00093faefd33f5965..9580c3fe1e062b4821b8bd10677aafbd8f5ddc5c 100644 (file)
--- 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",