From: David Bremner <david@tethera.net>
Date: Sat, 30 Oct 2021 18:49:20 +0000 (-0300)
Subject: rename built_with.sexpr_query to built_with.sexp_queries
X-Git-Tag: 0.35_rc0~88
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=b264a49be3dccb7d110eae6420019a052f1f665b

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 d3b18593..3c33232f 100644
--- 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
diff --git a/lib/built-with.c b/lib/built-with.c
index 89958e12..275e72b8 100644
--- 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;
-    } else if (STRNCMP_LITERAL (name, "sexpr_query") == 0) {
+    } else if (STRNCMP_LITERAL (name, "sexp_queries") == 0) {
 	return HAVE_SFSEXP;
     } else {
 	return false;
diff --git a/notmuch-config.c b/notmuch-config.c
index db00a26c..11d8d68b 100644
--- 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 ("%ssexpr_query=%s\n",
+    printf ("%ssexp_queries=%s\n",
 	    BUILT_WITH_PREFIX,
-	    notmuch_built_with ("sexpr_query") ? "true" : "false");
+	    notmuch_built_with ("sexp_queries") ? "true" : "false");
 }
 
 static int
diff --git a/test/T030-config.sh b/test/T030-config.sh
index 3a585d1b..b99eb9e7 100755
--- 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.sexpr_query=something
+built_with.sexp_queries=something
 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 ef22e964..38f72e5e 100755
--- 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.sexpr_query=something
+built_with.sexp_queries=something
 database.autocommit=8000
 database.backup_dir
 database.hook_dir