* [PATCH] NEWS: fix typo in 0.34 news. @ 2021-10-24 10:07 David Bremner 2021-10-28 1:14 ` David Bremner 0 siblings, 1 reply; 6+ messages in thread From: David Bremner @ 2021-10-24 10:07 UTC (permalink / raw) To: notmuch Thanks to jrm on IRC for finding the typo. --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a88d31ac..d08183bf 100644 --- a/NEWS +++ b/NEWS @@ -7,7 +7,7 @@ General An optional new s-expression based query parser is available if notmuch is built with the `sfsexp` library. See notmuch-sexp-queries(7) for syntax, and use `notmuch config get -built_with.sexpr_queries` to check if notmuch is compiled with +built_with.sexpr_query` to check if notmuch is compiled with s-expression query support. CLI -- 2.33.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] NEWS: fix typo in 0.34 news. 2021-10-24 10:07 [PATCH] NEWS: fix typo in 0.34 news David Bremner @ 2021-10-28 1:14 ` David Bremner 2021-10-28 5:43 ` Tomi Ollila 0 siblings, 1 reply; 6+ messages in thread From: David Bremner @ 2021-10-28 1:14 UTC (permalink / raw) To: notmuch David Bremner <david@tethera.net> writes: > Thanks to jrm on IRC for finding the typo. Applied to release and master. It (belatedly) occurs to me that it's a bit confusing to that the built_with option is sexpr_query, while the man page is notmuch-sexp-queries, and the option is --query=sexp What do people think about changing the built_with option to sexp_queries, to more or less match the man page? d ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] NEWS: fix typo in 0.34 news. 2021-10-28 1:14 ` David Bremner @ 2021-10-28 5:43 ` Tomi Ollila 2021-10-30 18:49 ` [PATCH] rename built_with.sexpr_query to built_with.sexp_queries David Bremner 0 siblings, 1 reply; 6+ messages in thread From: Tomi Ollila @ 2021-10-28 5:43 UTC (permalink / raw) To: David Bremner, notmuch On Wed, Oct 27 2021, David Bremner wrote: > David Bremner <david@tethera.net> writes: > >> Thanks to jrm on IRC for finding the typo. > > Applied to release and master. > > It (belatedly) occurs to me that it's a bit confusing to that the > built_with option is sexpr_query, while the man page is > notmuch-sexp-queries, and the option is --query=sexp > > What do people think about changing the built_with option to > sexp_queries, to more or less match the man page? I was thinking the same (when modifying wiki a few days ago...). I'd say yes. > > d Tomi ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] rename built_with.sexpr_query to built_with.sexp_queries 2021-10-28 5:43 ` Tomi Ollila @ 2021-10-30 18:49 ` David Bremner 2021-11-01 16:26 ` Tomi Ollila 2021-12-04 0:24 ` David Bremner 0 siblings, 2 replies; 6+ messages in thread From: David Bremner @ 2021-10-30 18:49 UTC (permalink / raw) To: Tomi Ollila, David Bremner, notmuch 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. --- doc/man7/notmuch-sexp-queries.rst | 2 +- lib/built-with.c | 2 +- notmuch-config.c | 4 ++-- test/T030-config.sh | 2 +- test/T055-path-config.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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 -- 2.33.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] rename built_with.sexpr_query to built_with.sexp_queries 2021-10-30 18:49 ` [PATCH] rename built_with.sexpr_query to built_with.sexp_queries David Bremner @ 2021-11-01 16:26 ` Tomi Ollila 2021-12-04 0:24 ` David Bremner 1 sibling, 0 replies; 6+ messages in thread From: Tomi Ollila @ 2021-11-01 16:26 UTC (permalink / raw) To: David Bremner, David Bremner, notmuch On Sat, Oct 30 2021, David Bremner wrote: > 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. like wrote before -- fine by me... Tomi > --- > doc/man7/notmuch-sexp-queries.rst | 2 +- > lib/built-with.c | 2 +- > notmuch-config.c | 4 ++-- > test/T030-config.sh | 2 +- > test/T055-path-config.sh | 2 +- > 5 files changed, 6 insertions(+), 6 deletions(-) > > 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 > -- > 2.33.0 > > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] rename built_with.sexpr_query to built_with.sexp_queries 2021-10-30 18:49 ` [PATCH] rename built_with.sexpr_query to built_with.sexp_queries David Bremner 2021-11-01 16:26 ` Tomi Ollila @ 2021-12-04 0:24 ` David Bremner 1 sibling, 0 replies; 6+ messages in thread From: David Bremner @ 2021-12-04 0:24 UTC (permalink / raw) To: Tomi Ollila, notmuch David Bremner <david@tethera.net> writes: > 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. applied to master d ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-12-04 0:24 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-10-24 10:07 [PATCH] NEWS: fix typo in 0.34 news David Bremner 2021-10-28 1:14 ` David Bremner 2021-10-28 5:43 ` Tomi Ollila 2021-10-30 18:49 ` [PATCH] rename built_with.sexpr_query to built_with.sexp_queries David Bremner 2021-11-01 16:26 ` Tomi Ollila 2021-12-04 0:24 ` David Bremner
Code repositories for project(s) associated with this public inbox https://yhetil.org/notmuch.git/ This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).