This lets us use the positive hooks variable in code, increasing clarity. --- notmuch-insert.c | 6 +++--- notmuch-new.c | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/notmuch-insert.c b/notmuch-insert.c index 648bd944a7b1..f0a3a33812a8 100644 --- a/notmuch-insert.c +++ b/notmuch-insert.c @@ -455,7 +455,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) char *folder = NULL; notmuch_bool_t create_folder = FALSE; notmuch_bool_t keep = FALSE; - notmuch_bool_t no_hooks = FALSE; + notmuch_bool_t hooks = TRUE; notmuch_bool_t synchronize_flags; const char *maildir; char *newpath; @@ -466,7 +466,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) { NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 }, { NOTMUCH_OPT_BOOLEAN, &create_folder, "create-folder", 0, 0 }, { NOTMUCH_OPT_BOOLEAN, &keep, "keep", 0, 0 }, - { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 }, + { NOTMUCH_OPT_BOOLEAN, &hooks, "hooks", 'n', 0 }, { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, { NOTMUCH_OPT_END, 0, 0, 0, 0 } }; @@ -575,7 +575,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[]) } } - if (! no_hooks && status == NOTMUCH_STATUS_SUCCESS) { + if (hooks && status == NOTMUCH_STATUS_SUCCESS) { /* Ignore hook failures. */ notmuch_run_hook (db_path, "post-insert"); } diff --git a/notmuch-new.c b/notmuch-new.c index faeb8f0a5896..cffecf745f1d 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -948,7 +948,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) int opt_index; unsigned int i; notmuch_bool_t timer_is_active = FALSE; - notmuch_bool_t no_hooks = FALSE; + notmuch_bool_t hooks = TRUE; notmuch_bool_t quiet = FALSE, verbose = FALSE; notmuch_status_t status; @@ -956,7 +956,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) { NOTMUCH_OPT_BOOLEAN, &quiet, "quiet", 'q', 0 }, { NOTMUCH_OPT_BOOLEAN, &verbose, "verbose", 'v', 0 }, { NOTMUCH_OPT_BOOLEAN, &add_files_state.debug, "debug", 'd', 0 }, - { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 }, + { NOTMUCH_OPT_BOOLEAN, &hooks, "hooks", 'n', 0 }, { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, { 0, 0, 0, 0, 0 } }; @@ -989,7 +989,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) } } - if (!no_hooks) { + if (hooks) { ret = notmuch_run_hook (db_path, "pre-new"); if (ret) return EXIT_FAILURE; @@ -1154,7 +1154,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_database_destroy (notmuch); - if (!no_hooks && !ret && !interrupted) + if (hooks && !ret && !interrupted) ret = notmuch_run_hook (db_path, "post-new"); if (ret || interrupted) -- 2.11.0 _______________________________________________ notmuch mailing list notmuch@notmuchmail.org https://notmuchmail.org/mailman/listinfo/notmuch