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.

diff --git a/doc/man7/notmuch-sexp-queries.rst b/doc/man7/notmuch-sexp-queries.rst
index d3b18593e30f31ce4f6492fc3c5a35397605917d..3c33232f9fadd05e5f0a5b3b78b8464fb7bb0305 100644 (file)
--- a/doc/man7/notmuch-sexp-queries.rst
+++ b/doc/man7/notmuch-sexp-queries.rst
@@ -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

diff --git a/lib/built-with.c b/lib/built-with.c
index 89958e1222d3582588f69de59958f717074c7902..275e72b89e84d3de95ac73d628576d8da1211d0d 100644 (file)
--- a/lib/built-with.c
+++ b/lib/built-with.c
@@ -32,7 +32,7 @@ notmuch_built_with (const char *name)
        return HAVE_XAPIAN_DB_RETRY_LOCK;
     } else if (STRNCMP_LITERAL (name, "session_key") == 0) {
        return true;
        return HAVE_XAPIAN_DB_RETRY_LOCK;
     } else if (STRNCMP_LITERAL (name, "session_key") == 0) {
        return true;

-    } else if (STRNCMP_LITERAL (name, "sexpr_query") == 0) {
+    } else if (STRNCMP_LITERAL (name, "sexp_queries") == 0) {

        return HAVE_SFSEXP;
     } else {
        return false;
        return HAVE_SFSEXP;
     } else {
        return false;

diff --git a/notmuch-config.c b/notmuch-config.c
index db00a26cd4327ce87f148f49bca9994450470656..11d8d68b5b5ead71d24d9f37202eaf958e8b1ccd 100644 (file)
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -680,9 +680,9 @@ _notmuch_config_list_built_with ()
     printf ("%sretry_lock=%s\n",
            BUILT_WITH_PREFIX,
            notmuch_built_with ("retry_lock") ? "true" : "false");
     printf ("%sretry_lock=%s\n",
            BUILT_WITH_PREFIX,
            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

diff --git a/test/T030-config.sh b/test/T030-config.sh
index 3a585d1b872db1b5694e3ec18527cc56ba389b28..b99eb9e77de4779a83392a1ddf78ae35742db1c1 100755 (executable)
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -51,7 +51,7 @@ cat <<EOF > EXPECTED
 built_with.compact=something
 built_with.field_processor=something
 built_with.retry_lock=something
 built_with.compact=something
 built_with.field_processor=something
 built_with.retry_lock=something

-built_with.sexpr_query=something
+built_with.sexp_queries=something

 database.autocommit=8000
 database.mail_root=MAIL_DIR
 database.path=MAIL_DIR
 database.autocommit=8000
 database.mail_root=MAIL_DIR
 database.path=MAIL_DIR

diff --git a/test/T055-path-config.sh b/test/T055-path-config.sh
index ef22e96410d1df96387e4549f7559d8badb3cc6f..38f72e5e3bee85cad71ee414518459cd84a5154c 100755 (executable)
--- a/test/T055-path-config.sh
+++ b/test/T055-path-config.sh
@@ -277,7 +277,7 @@ EOF
 built_with.compact=something
 built_with.field_processor=something
 built_with.retry_lock=something
 built_with.compact=something
 built_with.field_processor=something
 built_with.retry_lock=something

-built_with.sexpr_query=something
+built_with.sexp_queries=something

 database.autocommit=8000
 database.backup_dir
 database.hook_dir
 database.autocommit=8000
 database.backup_dir
 database.hook_dir