debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/help: give a hint about notmuch-emacs-mua

Browse source 
"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.
This commit is contained in:
Daniel Kahn Gillmor 2017-12-04 13:43:10 -05:00 committed by David Bremner
parent 03f4f75124
commit de80ede3df
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -1184,6 +1184,7 @@ COMMON_CONFIGURE_CFLAGS = \\
\$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS) \\ \$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS) \\
-DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS) \\ -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS) \\
-DHAVE_GETLINE=\$(HAVE_GETLINE) \\ -DHAVE_GETLINE=\$(HAVE_GETLINE) \\
-DWITH_EMACS=\$(WITH_EMACS) \\
-DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\ -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
-DHAVE_STRSEP=\$(HAVE_STRSEP) \\ -DHAVE_STRSEP=\$(HAVE_STRSEP) \\

7
notmuch.c
View file

@ -167,6 +167,10 @@ static command_t commands[] = {
"Re-index all messages matching the search terms." }, "Re-index all messages matching the search terms." },
{ "config", notmuch_config_command, NOTMUCH_CONFIG_OPEN, { "config", notmuch_config_command, NOTMUCH_CONFIG_OPEN,
"Get or set settings in the notmuch configuration file." }, "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 */ { "help", notmuch_help_command, NOTMUCH_CONFIG_CREATE, /* create but don't save config */
"This message, or more detailed help for the named command." } "This message, or more detailed help for the named command." }
}; };
@ -480,7 +484,8 @@ main (int argc, char *argv[])
notmuch_process_shared_options (command_name); notmuch_process_shared_options (command_name);
command = find_command (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. */ /* This won't return if the external command is found. */
if (try_external_command(argv + opt_index)) if (try_external_command(argv + opt_index))
fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",