From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id OPwjEcqTfWH7GQAAgWs5BA (envelope-from ) for ; Sat, 30 Oct 2021 20:49:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id n3vFDMqTfWHSWQAAB5/wlQ (envelope-from ) for ; Sat, 30 Oct 2021 18:49:46 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (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 D03A85481 for ; Sat, 30 Oct 2021 20:49:45 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 9CABE1F529; Sat, 30 Oct 2021 14:49:41 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8CBB11F474 for ; Sat, 30 Oct 2021 14:49:38 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 7C23D5FC42; Sat, 30 Oct 2021 14:49:38 -0400 (EDT) Received: (nullmailer pid 1537082 invoked by uid 1000); Sat, 30 Oct 2021 18:49:37 -0000 From: David Bremner To: Tomi Ollila , David Bremner , notmuch@notmuchmail.org Subject: [PATCH] rename built_with.sexpr_query to built_with.sexp_queries Date: Sat, 30 Oct 2021 15:49:20 -0300 Message-Id: <20211030184920.1537068-1-david@tethera.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: 6435VFFZOBBOIP5J73KGOXOR3X4XSSOM X-Message-ID-Hash: 6435VFFZOBBOIP5J73KGOXOR3X4XSSOM X-MailFrom: bremner@tethera.net 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=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635619785; 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; bh=bGFXHAw4NYNLM/lLGJDF9HjAbkxrCieH4xIvbpSesYk=; b=I91/1jQl0WPp8tZFBjIMXC1APjcAgKP0gmG18VK3tK88KeAMg3VDOm+H5qJkNbPkQSI2sE WMg/Qogxi82+gYwOv54wI25/bs13o57MIYGb1dbgv/ZCQVmRzvlG92V+Qh/oTgRavfmp3z 4I2ClPx7zag48LHQuLrP02PAaptiJ0sAeWecbdbHnYFSv1QIiEUtpoRfQzmc1yTzBxu7Et UGFAzR1qbUefd9YAsZpSEUILUmK4zToF36QlqfIoNQECfF143DKlQL/dFaQa3/pkSkR9Ml b8m5rZV1zfQul6VzXEPCnKzcdKgow4p4VUqRWH+54hS8eMFATy0Ii8a12qss9w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635619785; a=rsa-sha256; cv=none; b=TJduiSPvLHtSyj/NJQOB8GynmHTLe3StztofQ7n+Q8LFQDRYz/ot9gabSRvZcur1r+IC02 lJRLE/0DBgDWO1GMMYwpOIDtG8Oq1S02Nu0foc9OZ5hRTESP4D2xlzkGMjcPlU9Hey8eXe oG6RGp8CBSq6wQGWG//cfjHJsWmyYMIGtkXxCd8JsjdqX16BkYtC2Qq57rcp8UvozAuFaZ bRMvS7DCmCOPq8JhcNuaR1kJp48LGSEkijipUrqf5Sgk63ie66beLarA/5JF5rTK6iWIFc xX0Z6xgeRgQ6v+sV+/Trq1+IYpikBMN3fch2yEVWvnHX7byWAOXBph238I50kg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.15 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: D03A85481 X-Spam-Score: -1.15 X-Migadu-Scanner: scn0.migadu.com X-TUID: tyiPYYRreIQW 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 < 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