aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2022-11-21 15:39:43 +0100
committerStefan Kangas2022-11-22 02:24:20 +0100
commit40539c7587dc474b424cff732973fe8958eadf14 (patch)
treec98fb6254b98c1a2c8738edaf8141569ece244ad
parentaeadba1418d8fc18f17b4ae415cde35e9e272e7a (diff)
downloademacs-40539c7587dc474b424cff732973fe8958eadf14.tar.gz
emacs-40539c7587dc474b424cff732973fe8958eadf14.zip
; Fix typos
-rw-r--r--admin/notes/tree-sitter/build-module/README2
-rw-r--r--admin/notes/tree-sitter/html-manual/Multiple-Languages.html2
-rw-r--r--admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html2
-rw-r--r--admin/notes/tree-sitter/starter-guide4
-rw-r--r--doc/lispref/modes.texi2
-rw-r--r--doc/lispref/parsing.texi2
-rw-r--r--doc/misc/cc-mode.texi2
-rw-r--r--doc/misc/edt.texi12
-rw-r--r--doc/misc/efaq-w32.texi6
-rw-r--r--doc/misc/eglot.texi6
-rw-r--r--doc/misc/emacs-gnutls.texi2
-rw-r--r--doc/misc/gnus-faq.texi2
-rw-r--r--doc/misc/gnus.texi12
-rw-r--r--doc/misc/idlwave.texi2
-rw-r--r--doc/misc/mairix-el.texi2
-rw-r--r--doc/misc/message.texi2
-rw-r--r--etc/NEWS.242
-rw-r--r--lib-src/ChangeLog.12
-rw-r--r--lisp/ChangeLog.92
-rw-r--r--lisp/gnus/ChangeLog.32
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/jsonrpc.el2
-rw-r--r--lisp/treesit.el8
-rw-r--r--nt/icons/README2
-rw-r--r--src/treesit.c10
-rw-r--r--test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el2
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 d205661e6c3..2fcb9778dae 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
14 14
15This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript 15This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript
16(tsx), C# (csharp), C++ (cpp), Rust. More can be added to batch.sh 16(tsx), C# (csharp), C++ (cpp), Rust. More can be added to batch.sh
17unless it's directory strucure is not standard. \ No newline at end of file 17unless 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 0ae0b1897e1..46985649a82 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>
277pairs. Each <var>query</var> is a tree-sitter query in either the 277pairs. Each <var>query</var> is a tree-sitter query in either the
278string, s-expression or compiled form, or a function. 278string, s-expression or compiled form, or a function.
279</p> 279</p>
280<p>If <var>query</var> is a tree-sitter query, it should be preceeded by two 280<p>If <var>query</var> is a tree-sitter query, it should be preceded by two
281<var>:keyword</var>/<var>value</var> pairs, where the <code>:embed</code> keyword 281<var>:keyword</var>/<var>value</var> pairs, where the <code>:embed</code> keyword
282specifies the embedded language, and the <code>:host</code> keyword 282specifies the embedded language, and the <code>:host</code> keyword
283specified the host language. 283specified 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 3027bbaae95..95005de6d11 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>.
223<dt id='index-prev_002dline'><span><code>prev-line</code><a href='#index-prev_002dline' class='copiable-anchor'> &para;</a></span></dt> 223<dt id='index-prev_002dline'><span><code>prev-line</code><a href='#index-prev_002dline' class='copiable-anchor'> &para;</a></span></dt>
224<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>, 224<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
225<var>parent</var>, and <var>bol</var>, and returns the first non-whitespace 225<var>parent</var>, and <var>bol</var>, and returns the first non-whitespace
226charater on the previous line. 226character on the previous line.
227</p> 227</p>
228</dd> 228</dd>
229<dt id='index-point_002dmin'><span><code>point-min</code><a href='#index-point_002dmin' class='copiable-anchor'> &para;</a></span></dt> 229<dt id='index-point_002dmin'><span><code>point-min</code><a href='#index-point_002dmin' class='copiable-anchor'> &para;</a></span></dt>
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 700b020850d..faf40bc64fe 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -1,4 +1,4 @@
1STARTER GUIDE ON WRITTING MAJOR MODE WITH TREE-SITTER -*- org -*- 1STARTER GUIDE ON WRITING MAJOR MODE WITH TREE-SITTER -*- org -*-
2 2
3This document guides you on adding tree-sitter support to a major 3This document guides you on adding tree-sitter support to a major
4mode. 4mode.
@@ -274,7 +274,7 @@ the anchor point. Below are some convenient builtin matchers and anchors.
274For MATHCER we have 274For MATHCER we have
275 275
276 (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp 276 (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp
277 (node-is TYPE) => mathces NODE’s type 277 (node-is TYPE) => matches NODE’s type
278 (query QUERY) => matches if querying PARENT with QUERY 278 (query QUERY) => matches if querying PARENT with QUERY
279 captures NODE. 279 captures NODE.
280 280
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index b334105f1ee..c472f9b4411 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},
5000@item prev-line 5000@item prev-line
5001This anchor is a function that is called with 3 arguments: @var{node}, 5001This anchor is a function that is called with 3 arguments: @var{node},
5002@var{parent}, and @var{bol}, and returns the first non-whitespace 5002@var{parent}, and @var{bol}, and returns the first non-whitespace
5003charater on the previous line. 5003character on the previous line.
5004 5004
5005@item point-min 5005@item point-min
5006This anchor is a function that is called with 3 arguments: @var{node}, 5006This 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 f21d94ec8b3..0f6a99b299c 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}
1611pairs. Each @var{query} is a tree-sitter query in either the 1611pairs. Each @var{query} is a tree-sitter query in either the
1612string, s-expression or compiled form, or a function. 1612string, s-expression or compiled form, or a function.
1613 1613
1614If @var{query} is a tree-sitter query, it should be preceeded by two 1614If @var{query} is a tree-sitter query, it should be preceded by two
1615@var{:keyword}/@var{value} pairs, where the @code{:embed} keyword 1615@var{:keyword}/@var{value} pairs, where the @code{:embed} keyword
1616specifies the embedded language, and the @code{:host} keyword 1616specifies the embedded language, and the @code{:host} keyword
1617specified the host language. 1617specified the host language.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index bade04fb95c..a8f5248c4c8 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -898,7 +898,7 @@ lines.
898@vindex defun-tactic @r{(c-)} 898@vindex defun-tactic @r{(c-)}
899 899
900Move to the beginning or end of the current or next function. Other 900Move to the beginning or end of the current or next function. Other
901constructs (such as a structs or classes) which have a brace block 901constructs (such as structs or classes) which have a brace block
902also count as ``functions'' here. To move over several functions, you 902also count as ``functions'' here. To move over several functions, you
903can give these commands a repeat count. 903can give these commands a repeat count.
904 904
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index 8b4ac0da5d6..d6f9c9faf9b 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -317,7 +317,7 @@ emulation.
317Emacs binds keys to @acronym{ASCII} control characters and so does the 317Emacs binds keys to @acronym{ASCII} control characters and so does the
318real EDT@. Where EDT key bindings and Emacs key bindings conflict, 318real EDT@. Where EDT key bindings and Emacs key bindings conflict,
319the default Emacs key bindings are retained by the EDT emulation by 319the default Emacs key bindings are retained by the EDT emulation by
320default. If you are a diehard EDT user you may not like this. The 320default. If you are a die-hard EDT user you may not like this. The
321@ref{Control keys} section explains how to change this so that the EDT 321@ref{Control keys} section explains how to change this so that the EDT
322bindings to @acronym{ASCII} control characters override the default 322bindings to @acronym{ASCII} control characters override the default
323Emacs bindings. 323Emacs bindings.
@@ -443,7 +443,7 @@ the PC @key{NumLock} keypad key will be configurable for the emulation
443of the @key{PF1} key. The PC keypad can now emulate an LK-201 keypad 443of the @key{PF1} key. The PC keypad can now emulate an LK-201 keypad
444(less the comma key), the standard keyboard supplied with DEC terminals 444(less the comma key), the standard keyboard supplied with DEC terminals
445VT-200 and above. This @file{.xmodmaprc} file switches the role of the 445VT-200 and above. This @file{.xmodmaprc} file switches the role of the
446@key{F12} and @key{NumLock} keys. It has been tested on RedHat 446@key{F12} and @key{NumLock} keys. It has been tested on Red Hat
447GNU/Linux 5.2. Other versions of GNU/Linux may require different 447GNU/Linux 5.2. Other versions of GNU/Linux may require different
448keycodes. (@ref{Unix} for further help on how to do this.) 448keycodes. (@ref{Unix} for further help on how to do this.)
449 449
@@ -460,7 +460,7 @@ keycode assignments vary from system to system, some investigation is
460needed to see how to do this on a particular system. 460needed to see how to do this on a particular system.
461 461
462You will need to look at the output generated by @code{xmodmap} invoked 462You will need to look at the output generated by @code{xmodmap} invoked
463with the "-pm" switch. For example, on RedHat GNU/Linux 5.2 on a PC, we 463with the "-pm" switch. For example, on Red Hat GNU/Linux 5.2 on a PC, we
464get the following output when running @samp{xmodmap -pm}: 464get the following output when running @samp{xmodmap -pm}:
465 465
466@example 466@example
@@ -495,7 +495,7 @@ keycode 96 = F12
495 . 495 .
496@end example 496@end example
497 497
498@noindent So, in RedHat GNU/Linux 5.2 on a PC, Num_Lock generates keycode 77. 498@noindent So, in Red Hat GNU/Linux 5.2 on a PC, Num_Lock generates keycode 77.
499The following steps are taken: 499The following steps are taken:
500 500
501@enumerate 501@enumerate
@@ -883,7 +883,7 @@ Here are some examples:
883(setq edt-word-entities '(?\t) ; specifies TAB, the default 883(setq edt-word-entities '(?\t) ; specifies TAB, the default
884@end example 884@end example
885 885
886@noindent You can also specify characters by their decimal ascii values: 886@noindent You can also specify characters by their decimal ASCII values:
887 887
888@example 888@example
889(setq edt-word-entities '(9 45 47)) ; specifies TAB, - , and / 889(setq edt-word-entities '(9 45 47)) ; specifies TAB, - , and /
@@ -893,7 +893,7 @@ Here are some examples:
893@section Enabling EDT Control Key Sequence Bindings 893@section Enabling EDT Control Key Sequence Bindings
894 894
895Where EDT key bindings and Emacs key bindings conflict, the default 895Where EDT key bindings and Emacs key bindings conflict, the default
896Emacs key bindings are retained by default. Some diehard EDT users 896Emacs key bindings are retained by default. Some die-hard EDT users
897may not like this. So, if the variable 897may not like this. So, if the variable
898@code{edt-use-EDT-control-key-bindings} is set to true in a user's 898@code{edt-use-EDT-control-key-bindings} is set to true in a user's
899@file{.emacs} file, then the default EDT Emulation mode will enable most 899@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 b58f6be7581..bc3f545b2bb 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -457,12 +457,12 @@ to your init file:
457@node Using with Explorer 457@node Using with Explorer
458@subsection For use with Internet Explorer 458@subsection For use with Internet Explorer
459@cindex Internet Explorer, view source in Emacs 459@cindex Internet Explorer, view source in Emacs
460@cindex mailto urls, associating with Emacs 460@cindex mailto URLs, associating with Emacs
461@cindex news urls, associating with Emacs 461@cindex news URLs, associating with Emacs
462@cindex URLs, associating mail and news URLs with Emacs 462@cindex URLs, associating mail and news URLs with Emacs
463 463
464You can use Emacs as the editor for composing mail for 464You can use Emacs as the editor for composing mail for
465@indicateurl{mailto:} links, reading usenet for @indicateurl{news:} 465@indicateurl{mailto:} links, reading Usenet for @indicateurl{news:}
466links, and viewing source. The following registry entries control 466links, and viewing source. The following registry entries control
467this: 467this:
468 468
diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 04bdcc61614..a815aebf59b 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -280,7 +280,7 @@ able to find it.
280 280
281Sometimes, multiple servers are acceptable alternatives for handling a 281Sometimes, multiple servers are acceptable alternatives for handling a
282given major-mode. In those cases, you may combine the helper function 282given major-mode. In those cases, you may combine the helper function
283@code{eglot-alternatives} with the funcional form of 283@code{eglot-alternatives} with the functional form of
284@code{eglot-server-programs}. 284@code{eglot-server-programs}.
285 285
286@lisp 286@lisp
@@ -994,8 +994,8 @@ this variable should be a property list of the following format:
994Here @code{:@var{server}} identifies a particular language server and 994Here @code{:@var{server}} identifies a particular language server and
995@var{plist} is the corresponding keyword-value property list of one or 995@var{plist} is the corresponding keyword-value property list of one or
996more parameter settings for that server, serialized by Eglot as a JSON 996more parameter settings for that server, serialized by Eglot as a JSON
997object. @var{plist} may be arbitrarity complex, generally containing 997object. @var{plist} may be arbitrarily complex, generally containing
998other keywork-value property sublists corresponding to JSON subobjects. 998other keyword-value property sublists corresponding to JSON subobjects.
999The JSON values @code{true}, @code{false}, @code{null} and @code{@{@}} 999The JSON values @code{true}, @code{false}, @code{null} and @code{@{@}}
1000are represented by the Lisp values @code{t}, @code{:json-false}, 1000are represented by the Lisp values @code{t}, @code{:json-false},
1001@code{nil}, and @code{eglot-@{@}}, respectively. 1001@code{nil}, and @code{eglot-@{@}}, respectively.
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 1b9f5e10400..8c8a6f3154a 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
132distributions. By default the following locations are tried in this 132distributions. By default the following locations are tried in this
133order: @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu, 133order: @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu,
134Gentoo and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for 134Gentoo and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for
135Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse; 135Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for SUSE;
136@file{/usr/ssl/certs/ca-bundle.crt} for Cygwin; 136@file{/usr/ssl/certs/ca-bundle.crt} for Cygwin;
137@file{/usr/local/share/certs/ca-root-nss.crt} for FreeBSD@. You can 137@file{/usr/local/share/certs/ca-root-nss.crt} for FreeBSD@. You can
138easily customize @code{gnutls-trustfiles} to be something else, but 138easily customize @code{gnutls-trustfiles} to be something else, but
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 7cb5621b694..167a525ce81 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -189,7 +189,7 @@ through them?
189Gnus offers the topic mode, it allows you to sort your 189Gnus offers the topic mode, it allows you to sort your
190groups in, well, topics, e.g., all groups dealing with 190groups in, well, topics, e.g., all groups dealing with
191Linux under the topic linux, all dealing with music under 191Linux under the topic linux, all dealing with music under
192the topic music and all dealing with scottish music under 192the topic music and all dealing with Scottish music under
193the topic scottish which is a subtopic of music. 193the topic scottish which is a subtopic of music.
194 194
195To enter topic mode, just hit t while in Group buffer. Now 195To enter topic mode, just hit t while in Group buffer. Now
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c4705928d33..1d522bf9ca8 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -589,7 +589,7 @@ Decoding Variables
589Article Treatment 589Article Treatment
590 590
591* Article Highlighting:: You want to make the article look like fruit salad. 591* Article Highlighting:: You want to make the article look like fruit salad.
592* Article Fontisizing:: Making emphasized text look nice. 592* Article Fontifying:: Making emphasized text look nice.
593* Article Hiding:: You also want to make certain info go away. 593* Article Hiding:: You also want to make certain info go away.
594* Article Washing:: Lots of way-neat functions to make life better. 594* Article Washing:: Lots of way-neat functions to make life better.
595* Article Header:: Doing various header transformations. 595* Article Header:: Doing various header transformations.
@@ -1002,7 +1002,7 @@ The fundamental building blocks of Gnus are @dfn{servers},
1002Each server maintains a list of groups, and those groups contain 1002Each server maintains a list of groups, and those groups contain
1003articles. Because Gnus presents a unified interface to a wide variety 1003articles. Because Gnus presents a unified interface to a wide variety
1004of servers, the vocabulary doesn't always quite line up (@pxref{FAQ 1004of servers, the vocabulary doesn't always quite line up (@pxref{FAQ
1005- Glossary}, for a more complete glossary). Thus a local maildir is 1005- Glossary}, for a more complete glossary). Thus a local Maildir is
1006referred to as a ``server'' (@pxref{Finding the News}) the same as a 1006referred to as a ``server'' (@pxref{Finding the News}) the same as a
1007Usenet or IMAP server is; ``groups'' (@pxref{Group Buffer}) might mean 1007Usenet or IMAP server is; ``groups'' (@pxref{Group Buffer}) might mean
1008an NNTP group, IMAP folder, or local mail directory; and an 1008an NNTP group, IMAP folder, or local mail directory; and an
@@ -1039,7 +1039,7 @@ the News}, for details.
1039 1039
1040New mail has to come from somewhere. Some servers, such as NNTP or 1040New mail has to come from somewhere. Some servers, such as NNTP or
1041IMAP, are themselves responsible for fetching newly-arrived articles. 1041IMAP, are themselves responsible for fetching newly-arrived articles.
1042Others, such as maildir or mbox servers, only store articles and don't 1042Others, such as Maildir or mbox servers, only store articles and don't
1043fetch them from anywhere. 1043fetch them from anywhere.
1044 1044
1045In the latter case, Gnus provides for @code{mail sources}: places 1045In the latter case, Gnus provides for @code{mail sources}: places
@@ -8718,7 +8718,7 @@ these articles easier.
8718 8718
8719@menu 8719@menu
8720* Article Highlighting:: You want to make the article look like fruit salad. 8720* Article Highlighting:: You want to make the article look like fruit salad.
8721* Article Fontisizing:: Making emphasized text look nice. 8721* Article Fontifying:: Making emphasized text look nice.
8722* Article Hiding:: You also want to make certain info go away. 8722* Article Hiding:: You also want to make certain info go away.
8723* Article Washing:: Lots of way-neat functions to make life better. 8723* Article Washing:: Lots of way-neat functions to make life better.
8724* Article Header:: Doing various header transformations. 8724* Article Header:: Doing various header transformations.
@@ -8840,8 +8840,8 @@ default.
8840@xref{Customizing Articles}, for how to highlight articles automatically. 8840@xref{Customizing Articles}, for how to highlight articles automatically.
8841 8841
8842 8842
8843@node Article Fontisizing 8843@node Article Fontifying
8844@subsection Article Fontisizing 8844@subsection Article Fontifying
8845@cindex emphasis 8845@cindex emphasis
8846@cindex article emphasis 8846@cindex article emphasis
8847 8847
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 4bdbd5c2196..0c59fdf7385 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -3799,7 +3799,7 @@ configuration is not possible, but choices abound. The default
3799@code{idlwave-help-browser-function} inherits the browser configured 3799@code{idlwave-help-browser-function} inherits the browser configured
3800in @code{browse-url-browser-function}. 3800in @code{browse-url-browser-function}.
3801 3801
3802Note that the HTML files decompiled from the help sources contain 3802Note that the HTML files recompiled from the help sources contain
3803specific references to the @samp{Symbol} font, which by default is not 3803specific references to the @samp{Symbol} font, which by default is not
3804permitted in normal encodings (it's invalid, technically). Though it 3804permitted in normal encodings (it's invalid, technically). Though it
3805only impacts a few symbols, you can trick Mozilla-based browsers into 3805only 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 3632c64bd46..28b86c43aca 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -70,7 +70,7 @@ database.
70Mairix is a tool for indexing and searching words in locally stored 70Mairix is a tool for indexing and searching words in locally stored
71mail. It was written by Richard Curnow and is licensed under the 71mail. It was written by Richard Curnow and is licensed under the
72GPL@. Mairix comes with most popular GNU/Linux distributions, but it also 72GPL@. Mairix comes with most popular GNU/Linux distributions, but it also
73runs under Windows (with cygwin), macOS and Solaris. The website can 73runs under Windows (with Cygwin), macOS and Solaris. The website can
74be found at 74be found at
75@uref{http://www.rpcurnow.force9.co.uk/mairix/index.html} 75@uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
76 76
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index cfad4f4e07e..fb6e97f0d3d 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -935,7 +935,7 @@ Manual}).
935@section IDNA 935@section IDNA
936@cindex IDNA 936@cindex IDNA
937@cindex internationalized domain names 937@cindex internationalized domain names
938@cindex non-ascii domain names 938@cindex non-ASCII domain names
939 939
940@acronym{IDNA} is a standard way to encode non-@acronym{ASCII} domain 940@acronym{IDNA} is a standard way to encode non-@acronym{ASCII} domain
941names into a readable @acronym{ASCII} string. The details can be 941names into a readable @acronym{ASCII} string. The details can be
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index 8ef479ac0aa..fab8a39b0ed 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:
951 951
952*** the old version of todo-mode.el (renamed to otodo-mode.el). 952*** the old version of todo-mode.el (renamed to otodo-mode.el).
953 953
954*** xesam.el (owing to the cancellation of the XESAM project). 954*** xesam.el (owing to the cancelation of the XESAM project).
955 955
956*** yow.el; use fortune.el or cookie1.el instead. 956*** yow.el; use fortune.el or cookie1.el instead.
957 957
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 0829f50a56d..1a9767661ab 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -5643,7 +5643,7 @@
56431998-04-06 Andreas Schwab <schwab@gnu.org> 56431998-04-06 Andreas Schwab <schwab@gnu.org>
5644 5644
5645 Silence -Wimplicit: 5645 Silence -Wimplicit:
5646 * movemail.c: Move cancellations up. Include <stdlib.h> if 5646 * movemail.c: Move cancelations up. Include <stdlib.h> if
5647 available. 5647 available.
5648 * fakemail.c (_XOPEN_SOURCE): Define for declaration of cuserid. 5648 * fakemail.c (_XOPEN_SOURCE): Define for declaration of cuserid.
5649 (parse_header): Explicitly declare return type. 5649 (parse_header): Explicitly declare return type.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 4cb10d2d55e..469d0970f82 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -1888,7 +1888,7 @@
1888 (uniquify-item-greaterp): Substitutes uniquify-item-lessp. 1888 (uniquify-item-greaterp): Substitutes uniquify-item-lessp.
1889 This is equivalent to what the old code did. 1889 This is equivalent to what the old code did.
1890 (uniquify-rationalize-a-list): Never recompute the proposed 1890 (uniquify-rationalize-a-list): Never recompute the proposed
1891 name. Sort the conflicting sublist before rationalising it: this 1891 name. Sort the conflicting sublist before rationalizing it: this
1892 is equivalent to what the old code did, but one directory element 1892 is equivalent to what the old code did, but one directory element
1893 at a time, and only when necessary. 1893 at a time, and only when necessary.
1894 (uniquify-rationalize-conflicting-sublist): Recompute here the 1894 (uniquify-rationalize-conflicting-sublist): Recompute here the
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index c55d6225e3f..a1ad22fd62b 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -1109,7 +1109,7 @@
1109 1109
1110 * gnus-icalendar.el (gnus-icalendar-event:sync-to-org) 1110 * gnus-icalendar.el (gnus-icalendar-event:sync-to-org)
1111 (gnus-icalendar-event:inline-org-buttons): Allow for appointment 1111 (gnus-icalendar-event:inline-org-buttons): Allow for appointment
1112 cancellations to be synced to org if the original appt has an org 1112 cancelations to be synced to org if the original appt has an org
1113 outline. 1113 outline.
1114 1114
11152013-11-13 Jan Tatarik <jan.tatarik@gmail.com> 11152013-11-13 Jan Tatarik <jan.tatarik@gmail.com>
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3bbd68bdcd7..dca5b90089e 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7520,7 +7520,7 @@ to match all of yours addresses."
7520;;;###autoload 7520;;;###autoload
7521(defun message-cancel-news (&optional arg) 7521(defun message-cancel-news (&optional arg)
7522 "Cancel an article you posted. 7522 "Cancel an article you posted.
7523If ARG, allow editing of the cancellation message." 7523If ARG, allow editing of the cancelation message."
7524 (interactive "P") 7524 (interactive "P")
7525 (unless (message-news-p) 7525 (unless (message-news-p)
7526 (error "This is not a news article; canceling is impossible")) 7526 (error "This is not a news article; canceling is impossible"))
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 90833e1c1d7..1387fa36929 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -308,7 +308,7 @@ ignored."
308 (setq canceled t)) 308 (setq canceled t))
309 `(canceled ,cancel-on-input-retval)) 309 `(canceled ,cancel-on-input-retval))
310 (t (while t (accept-process-output nil 30))))) 310 (t (while t (accept-process-output nil 30)))))
311 ;; In normal operation, cancellation is handled by the 311 ;; In normal operation, cancelation is handled by the
312 ;; timeout function and response filter, but we still have 312 ;; timeout function and response filter, but we still have
313 ;; to protect against user-quit (C-g) or the 313 ;; to protect against user-quit (C-g) or the
314 ;; `cancel-on-input' case. 314 ;; `cancel-on-input' case.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index b81396fc229..24f0e1472d8 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -361,7 +361,7 @@ to change. Use `treesit-range-rules' to set this variable.")
361 "Produce settings for `treesit-range-settings'. 361 "Produce settings for `treesit-range-settings'.
362 362
363QUERY-SPECS are a series of QUERY-SPECs, where each QUERY-SPEC is 363QUERY-SPECS are a series of QUERY-SPECs, where each QUERY-SPEC is
364a QUERY preceeded by zero or more pairs of :KEYWORD and VALUE, 364a QUERY preceded by zero or more pairs of :KEYWORD and VALUE,
365like this: 365like this:
366 366
367 :KEYWORD VALUE... QUERY 367 :KEYWORD VALUE... QUERY
@@ -572,7 +572,7 @@ QUERY is a tree-sitter query in either the string, s-expression
572or compiled form. For each query, captured nodes are highlighted 572or compiled form. For each query, captured nodes are highlighted
573with the capture name as its face. 573with the capture name as its face.
574 574
575:KEYWORD and VALUE pairs preceeding a QUERY add meta information 575:KEYWORD and VALUE pairs preceding a QUERY add meta information
576to QUERY. For example, 576to QUERY. For example,
577 577
578 (treesit-font-lock-rules 578 (treesit-font-lock-rules
@@ -742,7 +742,7 @@ See `treesit-font-lock-rules' for their semantic."
742 742
743(defun treesit--set-nonsticky (start end sym &optional remove) 743(defun treesit--set-nonsticky (start end sym &optional remove)
744 "Set `rear-nonsticky' property between START and END. 744 "Set `rear-nonsticky' property between START and END.
745Set the proeprty to a list containing SYM. If there is already a 745Set the property to a list containing SYM. If there is already a
746list, add SYM to that list. If REMOVE is non-nil, remove SYM 746list, add SYM to that list. If REMOVE is non-nil, remove SYM
747instead." 747instead."
748 (let* ((prop (get-text-property start 'rear-nonsticky)) 748 (let* ((prop (get-text-property start 'rear-nonsticky))
@@ -902,7 +902,7 @@ parser notifying of the change."
902 (with-current-buffer (treesit-parser-buffer parser) 902 (with-current-buffer (treesit-parser-buffer parser)
903 (dolist (range ranges) 903 (dolist (range ranges)
904 (when treesit--font-lock-verbose 904 (when treesit--font-lock-verbose
905 (message "Notifier recieved range: %s-%s" 905 (message "Notifier received range: %s-%s"
906 (car range) (cdr range))) 906 (car range) (cdr range)))
907 (put-text-property (car range) (cdr range) 'fontified nil)))) 907 (put-text-property (car range) (cdr range) 'fontified nil))))
908 908
diff --git a/nt/icons/README b/nt/icons/README
index 4d9fb15e520..f84d4635b35 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -23,7 +23,7 @@ License: GNU General Public License version 3 or later (see COPYING)
23 <http://users.adelphia.net/~rob.davenport/gnuicons.html> 23 <http://users.adelphia.net/~rob.davenport/gnuicons.html>
24 "These are some images of a 3D stylized gnu head that I created back 24 "These are some images of a 3D stylized gnu head that I created back
25 in 1998. I started studying pictures of gnus and wildebeests and 25 in 1998. I started studying pictures of gnus and wildebeests and
26 worked with a 3D modeller, sPatch, until I came up with these. Then 26 worked with a 3D modeler, sPatch, until I came up with these. Then
27 I worked to make them into icons - cropping the horns off the sides 27 I worked to make them into icons - cropping the horns off the sides
28 so the images were big enough to be recognizable (to me anyway)." 28 so the images were big enough to be recognizable (to me anyway)."
29 29
diff --git a/src/treesit.c b/src/treesit.c
index 91c26374b3c..463e2458a63 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -295,7 +295,7 @@ init_treesit_functions (void)
295 a node. But since we can just retrieve a new node, it shouldn't 295 a node. But since we can just retrieve a new node, it shouldn't
296 be a limitation. 296 be a limitation.
297 297
298 - I didn't expose setting timeout and cancellation flag for a 298 - I didn't expose setting timeout and cancelation flag for a
299 parser, mainly because I don't think they are really necessary 299 parser, mainly because I don't think they are really necessary
300 in Emacs's use cases. 300 in Emacs's use cases.
301 301
@@ -891,7 +891,7 @@ treesit_ensure_parsed (Lisp_Object parser)
891 when 1) language is not set (impossible in Emacs because the user 891 when 1) language is not set (impossible in Emacs because the user
892 has to supply a language to create a parser), 2) parse canceled 892 has to supply a language to create a parser), 2) parse canceled
893 due to timeout (impossible because we don't set a timeout), 3) 893 due to timeout (impossible because we don't set a timeout), 3)
894 parse canceled due to cancellation flag (impossible because we 894 parse canceled due to cancelation flag (impossible because we
895 don't set the flag). (See comments for ts_parser_parse in 895 don't set the flag). (See comments for ts_parser_parse in
896 tree_sitter/api.h.) */ 896 tree_sitter/api.h.) */
897 if (new_tree == NULL) 897 if (new_tree == NULL)
@@ -1079,7 +1079,7 @@ treesit_compose_query_signal_data (uint32_t error_offset,
1079 1079
1080/* Ensure the QUERY is compiled. Return the TSQuery. It could be 1080/* Ensure the QUERY is compiled. Return the TSQuery. It could be
1081 NULL if error occurs, in which case ERROR_OFFSET and ERROR_TYPE are 1081 NULL if error occurs, in which case ERROR_OFFSET and ERROR_TYPE are
1082 bound. If error occures, return NULL, and assign SIGNAL_SYMBOL and 1082 bound. If error occurs, return NULL, and assign SIGNAL_SYMBOL and
1083 SIGNAL_DATA accordingly. */ 1083 SIGNAL_DATA accordingly. */
1084static TSQuery * 1084static TSQuery *
1085treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol, 1085treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
@@ -1366,7 +1366,7 @@ treesit_check_range_argument (Lisp_Object ranges)
1366} 1366}
1367 1367
1368/* Generate a list of ranges in Lisp from RANGES. This function 1368/* Generate a list of ranges in Lisp from RANGES. This function
1369 doens't take ownership of RANGES. BUFFER is used to convert 1369 doesn't take ownership of RANGES. BUFFER is used to convert
1370 between tree-sitter buffer offset and buffer position. */ 1370 between tree-sitter buffer offset and buffer position. */
1371static Lisp_Object 1371static Lisp_Object
1372treesit_make_ranges (const TSRange *ranges, uint32_t len, 1372treesit_make_ranges (const TSRange *ranges, uint32_t len,
@@ -2538,7 +2538,7 @@ treesit_traverse_sibling_helper (TSNode node, bool forward, bool named)
2538 } 2538 }
2539} 2539}
2540 2540
2541/* Return the first/last named/unamed child of NODE. FORWARD controls 2541/* Return the first/last named/unnamed child of NODE. FORWARD controls
2542 the direction and NAMED controls the nameness. */ 2542 the direction and NAMED controls the nameness. */
2543static TSNode 2543static TSNode
2544treesit_traverse_child_helper (TSNode node, bool forward, bool named) 2544treesit_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 474739d01be..711dc7b97fb 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 @@
106 (erc-d-t-search-for 1 "<joe>") 106 (erc-d-t-search-for 1 "<joe>")
107 (erc-d-t-absent-for 0.1 "<bob>") 107 (erc-d-t-absent-for 0.1 "<bob>")
108 (should (eq erc-server-process erc-server-process-bar)) 108 (should (eq erc-server-process erc-server-process-bar))
109 (erc-d-t-search-for 10 "keeps you from dishonour") 109 (erc-d-t-search-for 10 "keeps you from dishonor")
110 (erc-d-t-wait-for 5 (not (erc-server-process-alive))))) 110 (erc-d-t-wait-for 5 (not (erc-server-process-alive)))))
111 111
112 (when more (funcall more)))) 112 (when more (funcall more))))