From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mETAOikVgGEu+wAAgWs5BA (envelope-from ) for ; Mon, 01 Nov 2021 17:26:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +N4VNikVgGHAJQAA1q6Kng (envelope-from ) for ; Mon, 01 Nov 2021 16:26:17 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5C385B539 for ; Mon, 1 Nov 2021 17:26:17 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 547261FDCC; Mon, 1 Nov 2021 12:26:09 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) by mail.notmuchmail.org (Postfix) with ESMTPS id 7BA0C1F590 for ; Mon, 1 Nov 2021 12:26:05 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id CA6C31B0004B; Mon, 1 Nov 2021 18:26:02 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1635783962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DRHmwAIOnteJYsq/kYhaUU9TfpIWHyPVA0cFHCyx/Rs=; b=F762eAYb2gupkRKt5BzckVED2IeSYoTghD2q3rZi17nsNY/bqJNlVBWiF8DWTCX7AQ35r9 NYcdk8gsiPBxl3ZvN/uJ3qwVbywicdLvx7K7ONujUh8+q3OEH2mzRHrtUy8AvwehSf6rBj YCP+nxJU/bu427bo5KZHyhReVYp8bVt3PfCnetdAmNLPrE6UNeT4xzSsubxOIMZrId8wnA EktLtiYUST61E3cVFd1FODeM5QRiaYfD+D99sSjvxLSl1Z6BDRjuc+RIDxnJIdmX/lQpL+ GQeJtwQFYw3nqGDEl0u+4mp8bssTqSXJh7iYjSMPTQmeAYDkej0cxfHxRqHbCg== From: Tomi Ollila To: David Bremner , David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH] rename built_with.sexpr_query to built_with.sexp_queries In-Reply-To: <20211030184920.1537068-1-david@tethera.net> References: <20211030184920.1537068-1-david@tethera.net> User-Agent: Notmuch/0.33+54~gcaf4513 (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1635783962; a=rsa-sha256; cv=none; b=NrJUh4p6N7U/uAdbfGUtMuL9QgmoJEvzrwwlnJVQ6RdwsIUPJGBBEbRLfOeMNim9TUOuFS WPHIwbIERlsXQOeuz2xNkhrahaOTxhx/CqrHfYENIQ6xuIfBoJ2rgF1RO78d/uefpo3+3a VjgvEioE2gYzRHW9+WYXUr0+WBWzujVr7qpV1adoKAf3uXRD0rquSywoMovUpWTA39D2Vc LG9pRWxpwYMSvYRMfmw+92iKePafOcueUgxsmbUw4PG4nAIaWjeUgxMkhdWHHDPKkNnciX SHeO3HYeZZDyKWjCV0e4JU1G/ttFUAahNyOawN7wba79U1ezNfkJLjeaqOd3MQ== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1635783962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DRHmwAIOnteJYsq/kYhaUU9TfpIWHyPVA0cFHCyx/Rs=; b=QhQEEJXvBTcvWFosQzFyCv3BwBpjb2luHqtzxGtGBeBheUkm8T67UcfqHXlwHTi5DKOhHV AJcD1MFbK4k9hnsxDeQc9i5NpMrDHe585NXRhu0gobs4VfriJRGk+UunqE/KQfiOk6kH4E KEwr5ByJ7KWfMsBaM2iIBaCOy3OMKg8C2l1fnh7mv1EawgJn7xw0s7Pv7hdorjDjZKAhZk NkhURWoy97+UsiKXcOlwVHdbN2wsNytAXQVtYbKQ4leUB7/AgO3naKV4fnCvYkyjffI/Tu K5+YnULfr3xYKGXy6S3fpUMGdn0Qyf02z8g6dKs6WuuAt2Qf0/GvPhziA/+IdQ== Message-ID-Hash: 2OOJKNH62QMLND5DPZBOZQEVBL525HY2 X-Message-ID-Hash: 2OOJKNH62QMLND5DPZBOZQEVBL525HY2 X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635783977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=o1gGZBY19YfbJJ+oWQeQ7NErnnWUem/85L/aZbjCZ24=; b=XLaYcx49p9i3zqNeCtVziWbh9qMtRXD3DTbDZ3qSpI6+Iy7vjT/Q7yfCnJkWoIZX+CAsLS N/ieIJ7zwPZTmQNOQaRSK/N3puafkZnfuEFdabB17G8Wc5SulVcTuvoaUd2KtopZTlzM+9 p8K0NTju+yDHaEg3vUcI0XhhQbGuv12Ap5I/dLUJ6nvHQfn9SfFqegyeXE6T/5fpPNsmJj bx2x0LqX3XgR796AzsPIQGHW1uVxR18UMSuHDRZqJ2xq81WvZfawXzHTbnQ8jPBlGbgTfr 2MPGqlTjqbfz8bJxhJFDahY0I9I9jAeUlMlXkiclDbeoxJ0JlT5Ck99a8Axmfg== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1635783977; a=rsa-sha256; cv=fail; b=GoITNmOCN89ukYwz85rz37aQaEC3NrrNs2h77JAuA3Ozld/wp5ZO6b6tPFS4L6r2rNDN8k coloUcEAXmuoNs1elQvwQfq/wJ8DJVQNd0rC2nw1v8Njabz332+7FQcCN52+AsqI4mtb1m jI9JDNn2mZYGbub8gXse6wWB1jWpWFvvePjOMbG30me0bxjEM6GV6aXi4w3RmUaT0yvw62 r/DaY4ANAp16rkuAF94k/otTEyr6lC9sjBIe6q+jpGsMLrFnRpMos5KUtnV/a87Q3cpuCR Y+WFQCTlxbhVadVTNmfOiZzpVPmSwqTeDNJeMmCMsHjkxx60Uq7M92VDkB1yfA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=F762eAYb; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 0.89 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=lahtoruutu header.b=F762eAYb; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 5C385B539 X-Spam-Score: 0.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: hixwG17/AKZZ 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 < 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