From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 12275 invoked from network); 25 Dec 2021 21:40:07 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 25 Dec 2021 21:40:07 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1640468407; b=UpnxTxiwAYGVMuiRjj1yWDgSDLJt3W3qL9u8BVn/m2X0oLXrAOsw2CNuqJO3r1WxUyFKRb9rHL qXKAg9RdNNAqAGExuKw4NWKQ0zEJPIW09+uCpdDOIbiyveXzZhqkcr4i5RfV14ehzR5jKsNT2U mg3HeZpt0eKPkNqM5WZVGSruICo2ntwSpYBKMmSgwwGjuts3l3SuVgNdskcaL/hXge0eGFTQgA TRW5wIfBqOK8G0SRQyjDTm1a9BuTfXLdPvKUEmkraRwhmbqeYKeokpxUfHk8qicwF6qbGz/VkD gwolM9CLoa31zEhp8APbrUUz+Tj9Omjv5zbZIWe+tw5NmQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mx-out1.startmail.com) smtp.remote-ip=145.131.90.139; dkim=pass header.d=startmail.com header.s=2020-07 header.a=rsa-sha256; dmarc=none header.from=alxndr.me; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1640468407; bh=KSksOEUKeW7DPrmwEjbMjABqLKIFoYrfPCEGrCh/zP8=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:Cc:To:DKIM-Signature:From:DKIM-Signature; b=X7WRNsw1UEJV7Pw3YIwcs6uk51qZU+AgNedM5dKPpT47YKuJ63fJ41YTiQAyRt4eiIh36+5PeO fClDTtqQ4pbCc5vawKq8nt28O4qBfS2ruT1RMSVQr526kcAfabcGIlfl5GsH7FRi41Qgl84dra 2/qN0XG6rnvHYJpv5GdUAJ4Qjq2Ewo5GijuLClCAr54uumD4w2aN7+XGsaf4cwohYYQ2Ou+PCr cErw3KPqivCGRPvAyZaM6cdKZ1ZtMblDKR3Vi7WASPyp5e4XSKerONfm1S81QpJe6cyPaQNaDf Ms/gUQ4dkVt9YKJI7DS2/WLMaCXF+JuOo/pVIRhX015Spg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=swMG2izJq2C1nulCiWOoKdHez3tC0YCF4xDxC07nkuM=; b=p5KRNji60qbfXKkOE8fhYKIwkP ZfxPrGeYAo7mM8OZmrLN0Aib8qySX50vFgSjjm7VT2aUFH05KVG+WsT9NBl59aAmwVcmSUEtan+Q0 Hn3aoQEj9HOd63QlOdLcVs3Cx0WyLsjyzAQMG6aEwNny+vt37IoOeKgLBQAxmAOwaeD98VN7jWQWW 9GGHxR8VOfVy+jDAEIbj9RLxVO5GngOtwXcGBQ3ihyMOcTA0LDzFspicZVttuqKE+cIlCwkHqw7k1 wfyKiBfvCedKD1QhTa4rMEgN8Eci2Z5sZe61P5Df5IzDPBvYeS3JfW83X6+Ouwl157AE+19eQbu+R sxY9AtNg==; Received: from authenticated user by zero.zsh.org with local id 1n1Elp-000B4f-Dl; Sat, 25 Dec 2021 21:40:05 +0000 Authentication-Results: zsh.org; iprev=pass (mx-out1.startmail.com) smtp.remote-ip=145.131.90.139; dkim=pass header.d=startmail.com header.s=2020-07 header.a=rsa-sha256; dmarc=none header.from=alxndr.me; arc=none Received: from mx-out1.startmail.com ([145.131.90.139]:35669) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) id 1n1EhD-000AgF-Az; Sat, 25 Dec 2021 21:35:20 +0000 From: Matt Alexander DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=startmail.com; s=2020-07; t=1640468117; bh=swMG2izJq2C1nulCiWOoKdHez3tC0YCF4xDxC07nkuM=; h=From:To:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From:Subject:To:Date:Sender:Content-Type: Content-Transfer-Encoding:Content-Disposition:Mime-Version: Reply-To:In-Reply-To:References:Message-Id:Autocrypt; b=l7CIlWMUP4qBmHqFQUiYcjsdzqDmFSjAAxLasQz+MbJ/LZjp9h+MzuXXAnmGE6Ztf +64EptHaLA3c3UdP2QcT/J6Hs/jNORAGWIBufe0ytKX8bsyRQ7gdcNBuN7oUjbgPfT dR6QAZRGLcbTQxv/2sH7nATtVEHR1dIbgxjywt7l+tKYGtsDtupUZ1N/kTn+CbHF8X zgCTYUxxjVHPDF/NcQGC+txyKi/hZpkzpc8hQVlz4kqsyh2xBJPgv//vTpFo4uTGFp 5WvCwl7ywsJjD5ccBx7VgGNkmEwl0NrKhqRiRmSYtVW10w7q7jF3aCV2Q2DLqMJdcV cLxv23Hjd37ug== To: zsh-workers@zsh.org Cc: Matt Alexander , Daniel Shahaf Subject: [PATCH] Include US spelling of "grey" Date: Sat, 25 Dec 2021 15:35:12 -0600 Message-Id: <20211225213512.43310-1-matt@alxndr.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Validation-by: larryv@zsh.org X-Seq: 49667 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: The U.S. spelling of "colour" ("color") is referenced in the code, but the U.S. spelling of "grey" ("gray") is not. This change remedies that. https://www.merriam-webster.com/words-at-play/gray-vs-grey-usage-difference A code review has been conducted at GitHub: https://github.com/zsh-users/zsh/pull/84 Co-authored-by: Daniel Shahaf --- ChangeLog | 4 ++++ Functions/Misc/colors | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb24842f4..c14848c17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2021-12-25 Matt Alexander + + * Include US spelling of "grey" ("gray") + 2021-12-07 Oliver Kiddle * 49633: Completion/Unix/Command/_git: update options for git 2.34 diff --git a/Functions/Misc/colors b/Functions/Misc/colors index b221e6688..5e9d77d10 100644 --- a/Functions/Misc/colors +++ b/Functions/Misc/colors @@ -83,9 +83,11 @@ for k in ${color[(I)3?]}; do color[fg-${color[$k]}]=$k; done # This is inaccurate, but the prompt theme system needs it. -color[grey]=${color[black]} -color[fg-grey]=${color[grey]} -color[bg-grey]=${color[bg-black]} +for k in grey gray; do + color[$k]=${color[black]} + color[fg-$k]=${color[$k]} + color[bg-$k]=${color[bg-black]} +done # Assistance for the color-blind. -- 2.34.1