rename built_with.sexpr_query to built_with.sexp_queries

It is confusing to use two different names (sexp vs sexpr) when
compared with the command line option --query=sexp and (furthermore)
singular vs plural when compared with the man page title.
This commit is contained in:
David Bremner 2021-10-30 15:49:20 -03:00
parent fc3c79dd37
commit b264a49be3
5 changed files with 6 additions and 6 deletions

View file

@ -21,7 +21,7 @@ build of notmuch supports it with
:: ::
$ notmuch config get built_with.sexpr_query $ notmuch config get built_with.sexp_queries
S-EXPRESSIONS S-EXPRESSIONS

View file

@ -32,7 +32,7 @@ notmuch_built_with (const char *name)
return HAVE_XAPIAN_DB_RETRY_LOCK; return HAVE_XAPIAN_DB_RETRY_LOCK;
} else if (STRNCMP_LITERAL (name, "session_key") == 0) { } else if (STRNCMP_LITERAL (name, "session_key") == 0) {
return true; return true;
} else if (STRNCMP_LITERAL (name, "sexpr_query") == 0) { } else if (STRNCMP_LITERAL (name, "sexp_queries") == 0) {
return HAVE_SFSEXP; return HAVE_SFSEXP;
} else { } else {
return false; return false;

View file

@ -680,9 +680,9 @@ _notmuch_config_list_built_with ()
printf ("%sretry_lock=%s\n", printf ("%sretry_lock=%s\n",
BUILT_WITH_PREFIX, BUILT_WITH_PREFIX,
notmuch_built_with ("retry_lock") ? "true" : "false"); notmuch_built_with ("retry_lock") ? "true" : "false");
printf ("%ssexpr_query=%s\n", printf ("%ssexp_queries=%s\n",
BUILT_WITH_PREFIX, BUILT_WITH_PREFIX,
notmuch_built_with ("sexpr_query") ? "true" : "false"); notmuch_built_with ("sexp_queries") ? "true" : "false");
} }
static int static int

View file

@ -51,7 +51,7 @@ cat <<EOF > EXPECTED
built_with.compact=something built_with.compact=something
built_with.field_processor=something built_with.field_processor=something
built_with.retry_lock=something built_with.retry_lock=something
built_with.sexpr_query=something built_with.sexp_queries=something
database.autocommit=8000 database.autocommit=8000
database.mail_root=MAIL_DIR database.mail_root=MAIL_DIR
database.path=MAIL_DIR database.path=MAIL_DIR

View file

@ -277,7 +277,7 @@ EOF
built_with.compact=something built_with.compact=something
built_with.field_processor=something built_with.field_processor=something
built_with.retry_lock=something built_with.retry_lock=something
built_with.sexpr_query=something built_with.sexp_queries=something
database.autocommit=8000 database.autocommit=8000
database.backup_dir database.backup_dir
database.hook_dir database.hook_dir