[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 40539c7587 1/3: ; Fix typos
|
From: |
Stefan Kangas |
|
Subject: |
master 40539c7587 1/3: ; Fix typos |
|
Date: |
Mon, 21 Nov 2022 20:55:26 -0500 (EST) |
branch: master
commit 40539c7587dc474b424cff732973fe8958eadf14
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
; Fix typos
---
admin/notes/tree-sitter/build-module/README | 2 +-
admin/notes/tree-sitter/html-manual/Multiple-Languages.html | 2 +-
.../html-manual/Parser_002dbased-Indentation.html | 2 +-
admin/notes/tree-sitter/starter-guide | 4 ++--
doc/lispref/modes.texi | 2 +-
doc/lispref/parsing.texi | 2 +-
doc/misc/cc-mode.texi | 2 +-
doc/misc/edt.texi | 12 ++++++------
doc/misc/efaq-w32.texi | 6 +++---
doc/misc/eglot.texi | 6 +++---
doc/misc/emacs-gnutls.texi | 2 +-
doc/misc/gnus-faq.texi | 2 +-
doc/misc/gnus.texi | 12 ++++++------
doc/misc/idlwave.texi | 2 +-
doc/misc/mairix-el.texi | 2 +-
doc/misc/message.texi | 2 +-
etc/NEWS.24 | 2 +-
lib-src/ChangeLog.1 | 2 +-
lisp/ChangeLog.9 | 2 +-
lisp/gnus/ChangeLog.3 | 2 +-
lisp/gnus/message.el | 2 +-
lisp/jsonrpc.el | 2 +-
lisp/treesit.el | 8 ++++----
nt/icons/README | 2 +-
src/treesit.c | 10 +++++-----
test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el | 2 +-
26 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/admin/notes/tree-sitter/build-module/README
b/admin/notes/tree-sitter/build-module/README
index d205661e6c..2fcb9778da 100644
--- a/admin/notes/tree-sitter/build-module/README
+++ b/admin/notes/tree-sitter/build-module/README
@@ -14,4 +14,4 @@ To build all modules at once, run
This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript
(tsx), C# (csharp), C++ (cpp), Rust. More can be added to batch.sh
-unless it's directory strucure is not standard.
\ No newline at end of file
+unless it's directory structure is not standard.
\ No newline at end of file
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
index 0ae0b1897e..46985649a8 100644
--- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -277,7 +277,7 @@ a <var>query</var> preceded by zero or more
<var>keyword</var>/<var>value</var>
pairs. Each <var>query</var> is a tree-sitter query in either the
string, s-expression or compiled form, or a function.
</p>
-<p>If <var>query</var> is a tree-sitter query, it should be preceeded by two
+<p>If <var>query</var> is a tree-sitter query, it should be preceded by two
<var>:keyword</var>/<var>value</var> pairs, where the <code>:embed</code>
keyword
specifies the embedded language, and the <code>:host</code> keyword
specified the host language.
diff --git
a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
index 3027bbaae9..95005de6d1 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
@@ -223,7 +223,7 @@ sibling of <var>node</var>.
<dt id='index-prev_002dline'><span><code>prev-line</code><a
href='#index-prev_002dline' class='copiable-anchor'> ¶</a></span></dt>
<dd><p>This anchor is a function that is called with 3 arguments:
<var>node</var>,
<var>parent</var>, and <var>bol</var>, and returns the first non-whitespace
-charater on the previous line.
+character on the previous line.
</p>
</dd>
<dt id='index-point_002dmin'><span><code>point-min</code><a
href='#index-point_002dmin' class='copiable-anchor'> ¶</a></span></dt>
diff --git a/admin/notes/tree-sitter/starter-guide
b/admin/notes/tree-sitter/starter-guide
index 700b020850..faf40bc64f 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -1,4 +1,4 @@
-STARTER GUIDE ON WRITTING MAJOR MODE WITH TREE-SITTER -*- org -*-
+STARTER GUIDE ON WRITING MAJOR MODE WITH TREE-SITTER -*- org -*-
This document guides you on adding tree-sitter support to a major
mode.
@@ -274,7 +274,7 @@ the anchor point. Below are some convenient builtin
matchers and anchors.
For MATHCER we have
(parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp
- (node-is TYPE) => mathces NODE’s type
+ (node-is TYPE) => matches NODE’s type
(query QUERY) => matches if querying PARENT with QUERY
captures NODE.
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index b334105f1e..c472f9b441 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -5000,7 +5000,7 @@ This anchor is a function that is called with 3
arguments: @var{node},
@item prev-line
This anchor is a function that is called with 3 arguments: @var{node},
@var{parent}, and @var{bol}, and returns the first non-whitespace
-charater on the previous line.
+character on the previous line.
@item point-min
This anchor is a function that is called with 3 arguments: @var{node},
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index f21d94ec8b..0f6a99b299 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1611,7 +1611,7 @@ a @var{query} preceded by zero or more
@var{keyword}/@var{value}
pairs. Each @var{query} is a tree-sitter query in either the
string, s-expression or compiled form, or a function.
-If @var{query} is a tree-sitter query, it should be preceeded by two
+If @var{query} is a tree-sitter query, it should be preceded by two
@var{:keyword}/@var{value} pairs, where the @code{:embed} keyword
specifies the embedded language, and the @code{:host} keyword
specified the host language.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index bade04fb95..a8f5248c4c 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -898,7 +898,7 @@ lines.
@vindex defun-tactic @r{(c-)}
Move to the beginning or end of the current or next function. Other
-constructs (such as a structs or classes) which have a brace block
+constructs (such as structs or classes) which have a brace block
also count as ``functions'' here. To move over several functions, you
can give these commands a repeat count.
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index 8b4ac0da5d..d6f9c9faf9 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -317,7 +317,7 @@ emulation.
Emacs binds keys to @acronym{ASCII} control characters and so does the
real EDT@. Where EDT key bindings and Emacs key bindings conflict,
the default Emacs key bindings are retained by the EDT emulation by
-default. If you are a diehard EDT user you may not like this. The
+default. If you are a die-hard EDT user you may not like this. The
@ref{Control keys} section explains how to change this so that the EDT
bindings to @acronym{ASCII} control characters override the default
Emacs bindings.
@@ -443,7 +443,7 @@ the PC @key{NumLock} keypad key will be configurable for
the emulation
of the @key{PF1} key. The PC keypad can now emulate an LK-201 keypad
(less the comma key), the standard keyboard supplied with DEC terminals
VT-200 and above. This @file{.xmodmaprc} file switches the role of the
-@key{F12} and @key{NumLock} keys. It has been tested on RedHat
+@key{F12} and @key{NumLock} keys. It has been tested on Red Hat
GNU/Linux 5.2. Other versions of GNU/Linux may require different
keycodes. (@ref{Unix} for further help on how to do this.)
@@ -460,7 +460,7 @@ keycode assignments vary from system to system, some
investigation is
needed to see how to do this on a particular system.
You will need to look at the output generated by @code{xmodmap} invoked
-with the "-pm" switch. For example, on RedHat GNU/Linux 5.2 on a PC, we
+with the "-pm" switch. For example, on Red Hat GNU/Linux 5.2 on a PC, we
get the following output when running @samp{xmodmap -pm}:
@example
@@ -495,7 +495,7 @@ keycode 96 = F12
.
@end example
-@noindent So, in RedHat GNU/Linux 5.2 on a PC, Num_Lock generates keycode 77.
+@noindent So, in Red Hat GNU/Linux 5.2 on a PC, Num_Lock generates keycode 77.
The following steps are taken:
@enumerate
@@ -883,7 +883,7 @@ Here are some examples:
(setq edt-word-entities '(?\t) ; specifies TAB, the default
@end example
-@noindent You can also specify characters by their decimal ascii values:
+@noindent You can also specify characters by their decimal ASCII values:
@example
(setq edt-word-entities '(9 45 47)) ; specifies TAB, - , and /
@@ -893,7 +893,7 @@ Here are some examples:
@section Enabling EDT Control Key Sequence Bindings
Where EDT key bindings and Emacs key bindings conflict, the default
-Emacs key bindings are retained by default. Some diehard EDT users
+Emacs key bindings are retained by default. Some die-hard EDT users
may not like this. So, if the variable
@code{edt-use-EDT-control-key-bindings} is set to true in a user's
@file{.emacs} file, then the default EDT Emulation mode will enable most
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index b58f6be758..bc3f545b2b 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -457,12 +457,12 @@ to your init file:
@node Using with Explorer
@subsection For use with Internet Explorer
@cindex Internet Explorer, view source in Emacs
-@cindex mailto urls, associating with Emacs
-@cindex news urls, associating with Emacs
+@cindex mailto URLs, associating with Emacs
+@cindex news URLs, associating with Emacs
@cindex URLs, associating mail and news URLs with Emacs
You can use Emacs as the editor for composing mail for
-@indicateurl{mailto:} links, reading usenet for @indicateurl{news:}
+@indicateurl{mailto:} links, reading Usenet for @indicateurl{news:}
links, and viewing source. The following registry entries control
this:
diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 04bdcc6161..a815aebf59 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -280,7 +280,7 @@ able to find it.
Sometimes, multiple servers are acceptable alternatives for handling a
given major-mode. In those cases, you may combine the helper function
-@code{eglot-alternatives} with the funcional form of
+@code{eglot-alternatives} with the functional form of
@code{eglot-server-programs}.
@lisp
@@ -994,8 +994,8 @@ this variable should be a property list of the following
format:
Here @code{:@var{server}} identifies a particular language server and
@var{plist} is the corresponding keyword-value property list of one or
more parameter settings for that server, serialized by Eglot as a JSON
-object. @var{plist} may be arbitrarity complex, generally containing
-other keywork-value property sublists corresponding to JSON subobjects.
+object. @var{plist} may be arbitrarily complex, generally containing
+other keyword-value property sublists corresponding to JSON subobjects.
The JSON values @code{true}, @code{false}, @code{null} and @code{@{@}}
are represented by the Lisp values @code{t}, @code{:json-false},
@code{nil}, and @code{eglot-@{@}}, respectively.
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 1b9f5e1040..8c8a6f3154 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -132,7 +132,7 @@ PEM or DER format and examples can be found in most Unix
distributions. By default the following locations are tried in this
order: @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu,
Gentoo and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for
-Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse;
+Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for SUSE;
@file{/usr/ssl/certs/ca-bundle.crt} for Cygwin;
@file{/usr/local/share/certs/ca-root-nss.crt} for FreeBSD@. You can
easily customize @code{gnutls-trustfiles} to be something else, but
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 7cb5621b69..167a525ce8 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -189,7 +189,7 @@ through them?
Gnus offers the topic mode, it allows you to sort your
groups in, well, topics, e.g., all groups dealing with
Linux under the topic linux, all dealing with music under
-the topic music and all dealing with scottish music under
+the topic music and all dealing with Scottish music under
the topic scottish which is a subtopic of music.
To enter topic mode, just hit t while in Group buffer. Now
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c4705928d3..1d522bf9ca 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -589,7 +589,7 @@ Decoding Variables
Article Treatment
* Article Highlighting:: You want to make the article look like fruit
salad.
-* Article Fontisizing:: Making emphasized text look nice.
+* Article Fontifying:: Making emphasized text look nice.
* Article Hiding:: You also want to make certain info go away.
* Article Washing:: Lots of way-neat functions to make life better.
* Article Header:: Doing various header transformations.
@@ -1002,7 +1002,7 @@ The fundamental building blocks of Gnus are @dfn{servers},
Each server maintains a list of groups, and those groups contain
articles. Because Gnus presents a unified interface to a wide variety
of servers, the vocabulary doesn't always quite line up (@pxref{FAQ
-- Glossary}, for a more complete glossary). Thus a local maildir is
+- Glossary}, for a more complete glossary). Thus a local Maildir is
referred to as a ``server'' (@pxref{Finding the News}) the same as a
Usenet or IMAP server is; ``groups'' (@pxref{Group Buffer}) might mean
an NNTP group, IMAP folder, or local mail directory; and an
@@ -1039,7 +1039,7 @@ the News}, for details.
New mail has to come from somewhere. Some servers, such as NNTP or
IMAP, are themselves responsible for fetching newly-arrived articles.
-Others, such as maildir or mbox servers, only store articles and don't
+Others, such as Maildir or mbox servers, only store articles and don't
fetch them from anywhere.
In the latter case, Gnus provides for @code{mail sources}: places
@@ -8718,7 +8718,7 @@ these articles easier.
@menu
* Article Highlighting:: You want to make the article look like fruit
salad.
-* Article Fontisizing:: Making emphasized text look nice.
+* Article Fontifying:: Making emphasized text look nice.
* Article Hiding:: You also want to make certain info go away.
* Article Washing:: Lots of way-neat functions to make life better.
* Article Header:: Doing various header transformations.
@@ -8840,8 +8840,8 @@ default.
@xref{Customizing Articles}, for how to highlight articles automatically.
-@node Article Fontisizing
-@subsection Article Fontisizing
+@node Article Fontifying
+@subsection Article Fontifying
@cindex emphasis
@cindex article emphasis
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 4bdbd5c219..0c59fdf738 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -3799,7 +3799,7 @@ configuration is not possible, but choices abound. The
default
@code{idlwave-help-browser-function} inherits the browser configured
in @code{browse-url-browser-function}.
-Note that the HTML files decompiled from the help sources contain
+Note that the HTML files recompiled from the help sources contain
specific references to the @samp{Symbol} font, which by default is not
permitted in normal encodings (it's invalid, technically). Though it
only impacts a few symbols, you can trick Mozilla-based browsers into
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 3632c64bd4..28b86c43ac 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -70,7 +70,7 @@ database.
Mairix is a tool for indexing and searching words in locally stored
mail. It was written by Richard Curnow and is licensed under the
GPL@. Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), macOS and Solaris. The website can
+runs under Windows (with Cygwin), macOS and Solaris. The website can
be found at
@uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index cfad4f4e07..fb6e97f0d3 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -935,7 +935,7 @@ Manual}).
@section IDNA
@cindex IDNA
@cindex internationalized domain names
-@cindex non-ascii domain names
+@cindex non-ASCII domain names
@acronym{IDNA} is a standard way to encode non-@acronym{ASCII} domain
names into a readable @acronym{ASCII} string. The details can be
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index 8ef479ac0a..fab8a39b0e 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -951,7 +951,7 @@ Also the following files used by the now obsolete
otodo-mode.el:
*** the old version of todo-mode.el (renamed to otodo-mode.el).
-*** xesam.el (owing to the cancellation of the XESAM project).
+*** xesam.el (owing to the cancelation of the XESAM project).
*** yow.el; use fortune.el or cookie1.el instead.
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 0829f50a56..1a9767661a 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -5643,7 +5643,7 @@
1998-04-06 Andreas Schwab <schwab@gnu.org>
Silence -Wimplicit:
- * movemail.c: Move cancellations up. Include <stdlib.h> if
+ * movemail.c: Move cancelations up. Include <stdlib.h> if
available.
* fakemail.c (_XOPEN_SOURCE): Define for declaration of cuserid.
(parse_header): Explicitly declare return type.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 4cb10d2d55..469d0970f8 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -1888,7 +1888,7 @@
(uniquify-item-greaterp): Substitutes uniquify-item-lessp.
This is equivalent to what the old code did.
(uniquify-rationalize-a-list): Never recompute the proposed
- name. Sort the conflicting sublist before rationalising it: this
+ name. Sort the conflicting sublist before rationalizing it: this
is equivalent to what the old code did, but one directory element
at a time, and only when necessary.
(uniquify-rationalize-conflicting-sublist): Recompute here the
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index c55d6225e3..a1ad22fd62 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -1109,7 +1109,7 @@
* gnus-icalendar.el (gnus-icalendar-event:sync-to-org)
(gnus-icalendar-event:inline-org-buttons): Allow for appointment
- cancellations to be synced to org if the original appt has an org
+ cancelations to be synced to org if the original appt has an org
outline.
2013-11-13 Jan Tatarik <jan.tatarik@gmail.com>
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3bbd68bdcd..dca5b90089 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7520,7 +7520,7 @@ to match all of yours addresses."
;;;###autoload
(defun message-cancel-news (&optional arg)
"Cancel an article you posted.
-If ARG, allow editing of the cancellation message."
+If ARG, allow editing of the cancelation message."
(interactive "P")
(unless (message-news-p)
(error "This is not a news article; canceling is impossible"))
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 90833e1c1d..1387fa3692 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -308,7 +308,7 @@ ignored."
(setq canceled t))
`(canceled ,cancel-on-input-retval))
(t (while t (accept-process-output nil 30)))))
- ;; In normal operation, cancellation is handled by the
+ ;; In normal operation, cancelation is handled by the
;; timeout function and response filter, but we still have
;; to protect against user-quit (C-g) or the
;; `cancel-on-input' case.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index b81396fc22..24f0e1472d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -361,7 +361,7 @@ to change. Use `treesit-range-rules' to set this
variable.")
"Produce settings for `treesit-range-settings'.
QUERY-SPECS are a series of QUERY-SPECs, where each QUERY-SPEC is
-a QUERY preceeded by zero or more pairs of :KEYWORD and VALUE,
+a QUERY preceded by zero or more pairs of :KEYWORD and VALUE,
like this:
:KEYWORD VALUE... QUERY
@@ -572,7 +572,7 @@ QUERY is a tree-sitter query in either the string,
s-expression
or compiled form. For each query, captured nodes are highlighted
with the capture name as its face.
-:KEYWORD and VALUE pairs preceeding a QUERY add meta information
+:KEYWORD and VALUE pairs preceding a QUERY add meta information
to QUERY. For example,
(treesit-font-lock-rules
@@ -742,7 +742,7 @@ See `treesit-font-lock-rules' for their semantic."
(defun treesit--set-nonsticky (start end sym &optional remove)
"Set `rear-nonsticky' property between START and END.
-Set the proeprty to a list containing SYM. If there is already a
+Set the property to a list containing SYM. If there is already a
list, add SYM to that list. If REMOVE is non-nil, remove SYM
instead."
(let* ((prop (get-text-property start 'rear-nonsticky))
@@ -902,7 +902,7 @@ parser notifying of the change."
(with-current-buffer (treesit-parser-buffer parser)
(dolist (range ranges)
(when treesit--font-lock-verbose
- (message "Notifier recieved range: %s-%s"
+ (message "Notifier received range: %s-%s"
(car range) (cdr range)))
(put-text-property (car range) (cdr range) 'fontified nil))))
diff --git a/nt/icons/README b/nt/icons/README
index 4d9fb15e52..f84d4635b3 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -23,7 +23,7 @@ License: GNU General Public License version 3 or later (see
COPYING)
<http://users.adelphia.net/~rob.davenport/gnuicons.html>
"These are some images of a 3D stylized gnu head that I created back
in 1998. I started studying pictures of gnus and wildebeests and
- worked with a 3D modeller, sPatch, until I came up with these. Then
+ worked with a 3D modeler, sPatch, until I came up with these. Then
I worked to make them into icons - cropping the horns off the sides
so the images were big enough to be recognizable (to me anyway)."
diff --git a/src/treesit.c b/src/treesit.c
index 91c26374b3..463e2458a6 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -295,7 +295,7 @@ init_treesit_functions (void)
a node. But since we can just retrieve a new node, it shouldn't
be a limitation.
- - I didn't expose setting timeout and cancellation flag for a
+ - I didn't expose setting timeout and cancelation flag for a
parser, mainly because I don't think they are really necessary
in Emacs's use cases.
@@ -891,7 +891,7 @@ treesit_ensure_parsed (Lisp_Object parser)
when 1) language is not set (impossible in Emacs because the user
has to supply a language to create a parser), 2) parse canceled
due to timeout (impossible because we don't set a timeout), 3)
- parse canceled due to cancellation flag (impossible because we
+ parse canceled due to cancelation flag (impossible because we
don't set the flag). (See comments for ts_parser_parse in
tree_sitter/api.h.) */
if (new_tree == NULL)
@@ -1079,7 +1079,7 @@ treesit_compose_query_signal_data (uint32_t error_offset,
/* Ensure the QUERY is compiled. Return the TSQuery. It could be
NULL if error occurs, in which case ERROR_OFFSET and ERROR_TYPE are
- bound. If error occures, return NULL, and assign SIGNAL_SYMBOL and
+ bound. If error occurs, return NULL, and assign SIGNAL_SYMBOL and
SIGNAL_DATA accordingly. */
static TSQuery *
treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
@@ -1366,7 +1366,7 @@ treesit_check_range_argument (Lisp_Object ranges)
}
/* Generate a list of ranges in Lisp from RANGES. This function
- doens't take ownership of RANGES. BUFFER is used to convert
+ doesn't take ownership of RANGES. BUFFER is used to convert
between tree-sitter buffer offset and buffer position. */
static Lisp_Object
treesit_make_ranges (const TSRange *ranges, uint32_t len,
@@ -2538,7 +2538,7 @@ treesit_traverse_sibling_helper (TSNode node, bool
forward, bool named)
}
}
-/* Return the first/last named/unamed child of NODE. FORWARD controls
+/* Return the first/last named/unnamed child of NODE. FORWARD controls
the direction and NAMED controls the nameness. */
static TSNode
treesit_traverse_child_helper (TSNode node, bool forward, bool named)
diff --git a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
index 474739d01b..711dc7b97f 100644
--- a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
+++ b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
@@ -106,7 +106,7 @@
(erc-d-t-search-for 1 "<joe>")
(erc-d-t-absent-for 0.1 "<bob>")
(should (eq erc-server-process erc-server-process-bar))
- (erc-d-t-search-for 10 "keeps you from dishonour")
+ (erc-d-t-search-for 10 "keeps you from dishonor")
(erc-d-t-wait-for 5 (not (erc-server-process-alive)))))
(when more (funcall more))))