zsh-workers
 help / color / mirror / code / Atom feed
From: Matt Alexander <matt@alxndr.me>
To: zsh-workers@zsh.org
Cc: Matt Alexander <matt@alxndr.me>, Daniel Shahaf <d.s@daniel.shahaf.name>
Subject: [PATCH] Include US spelling of "grey"
Date: Sat, 25 Dec 2021 15:35:12 -0600	[thread overview]
Message-ID: <20211225213512.43310-1-matt@alxndr.me> (raw)

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 <d.s@daniel.shahaf.name>
---
 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  <matt@alxndr.me>
+
+	* Include US spelling of "grey" ("gray")
+
 2021-12-07  Oliver Kiddle  <opk@zsh.org>
 
 	* 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



             reply	other threads:[~2021-12-25 21:40 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-25 21:35 Matt Alexander [this message]
2022-01-01 22:40 ` Bart Schaefer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211225213512.43310-1-matt@alxndr.me \
    --to=matt@alxndr.me \
    --cc=d.s@daniel.shahaf.name \
    --cc=zsh-workers@zsh.org \
    --subject='Re: [PATCH] Include US spelling of "grey"' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://git.vuxu.org/mirror/zsh/

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 NNTP newsgroup(s).