[PATCH v2] cli/help: give a hint about notmuch-emacs-mua

[Tomi Ollila]

On Mon, Dec 04 2017, Daniel Kahn Gillmor wrote:

> "notmuch help" doesn't mention "notmuch-emacs-mua" even though we
> support it through the try_external_command() mechanism.
>
> In addition, "notmuch help emacs-mua" doesn't work, even though we
> ship the appropriate manpage.
>
> This changeset fixes both of these problems.

+1

Tomi


> ---
>  configure | 1 +
>  notmuch.c | 7 ++++++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index bd034f91..f1974520 100755
> --- a/configure
> +++ b/configure
> @@ -1185,6 +1185,7 @@ COMMON_CONFIGURE_CFLAGS = \\
>  	\$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS)	\\
>  	-DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS)	\\
>  	-DHAVE_GETLINE=\$(HAVE_GETLINE)				\\
> +	-DWITH_EMACS=\$(WITH_EMACS)				\\
>  	-DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\
>  	-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)			\\
>  	-DHAVE_STRSEP=\$(HAVE_STRSEP)				\\
> diff --git a/notmuch.c b/notmuch.c
> index d5bf7902..2d193aa8 100644
> --- a/notmuch.c
> +++ b/notmuch.c
> @@ -172,6 +172,10 @@ static command_t commands[] = {
>        "Re-index all messages matching the search terms." },
>      { "config", notmuch_config_command, NOTMUCH_CONFIG_OPEN,
>        "Get or set settings in the notmuch configuration file." },
> +#if WITH_EMACS
> +    { "emacs-mua", NULL, 0,
> +      "send mail with notmuch and emacs." },
> +#endif
>      { "help", notmuch_help_command, NOTMUCH_CONFIG_CREATE, /* create but don't save config */
>        "This message, or more detailed help for the named command." }
>  };
> @@ -487,7 +491,8 @@ main (int argc, char *argv[])
>      notmuch_process_shared_options (command_name);
>  
>      command = find_command (command_name);
> -    if (!command) {
> +    /* if command->function is NULL, try external command */
> +    if (!command || !command->function) {
>  	/* This won't return if the external command is found. */
>  	if (try_external_command(argv + opt_index))
>  	    fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
> -- 
> 2.15.0
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch