summaryrefslogtreecommitdiff
path: root/src/xfaces.c
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-07-14 11:37:42 +0200
committerStefan Kangas <stefan@marxist.se>2022-07-14 11:37:42 +0200
commit4e79f77635a80e0c25841ba15feb0e70c8824516 (patch)
tree7f68cf7d809a10e6c2501fb3d9451047fb8da051 /src/xfaces.c
parente1d93302c29916e738552484b9363c5b9e77c5c1 (diff)
parent5e47ec95118c06dd66cd488ad25775d801d75c0c (diff)
downloademacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz
Merge from origin/emacs-28
5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo. ba0871bef1 ; Fix typos: prefer American spelling e3e7f31faa Adapt Tramp doc # Conflicts: # etc/NEWS # etc/themes/modus-themes.el # lisp/emacs-lisp/byte-opt.el # test/lisp/so-long-tests/spelling-tests.el
Diffstat (limited to 'src/xfaces.c')
-rw-r--r--src/xfaces.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 8ae922578ec..bbc1d352c6e 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -965,7 +965,7 @@ DEFUN ("color-values-from-color-spec",
Scolor_values_from_color_spec,
1, 1, 0,
doc: /* Parse color SPEC as a numeric color and return (RED GREEN BLUE).
-This function recognises the following formats for SPEC:
+This function recognizes the following formats for SPEC:
#RGB, where R, G and B are hex numbers of equal length, 1-4 digits each.
rgb:R/G/B, where R, G, and B are hex numbers, 1-4 digits each.