Merge branch 'main' into emacs-30

5 files changed, 6 insertions, 6 deletions

diff --git a/NEWS.org b/NEWS.org
index b081c4c..5f20469 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -290,7 +290,7 @@ directly (see [[compat-srht:2]]).
 * Release of "Compat" Version 28.1.1.0
 
 This release mostly fixes a number of smaller bugs that were not
-identified as of 28.1.0.0.  Nevertheless these warrent a version bump,
+identified as of 28.1.0.0.  Nevertheless these warrant a version bump,
 as some of these changes a functional.  These include:
 
 - The addition of the =file-attribute-*= accessor functions.
diff --git a/compat-28.el b/compat-28.el
index f9719f3..9bf0ed2 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -782,7 +782,7 @@ Other uses risk returning non-nil value that point to the wrong file."
 ;;;; Defined in env.el
 
 (compat-defmacro with-environment-variables (variables &rest body) ;; <compat-tests:with-environment-variables>
-  "Set VARIABLES in the environent and execute BODY.
+  "Set VARIABLES in the environment and execute BODY.
 VARIABLES is a list of variable settings of the form (VAR VALUE),
 where VAR is the name of the variable (a string) and VALUE
 is its value (also a string).
diff --git a/compat-macs.el b/compat-macs.el
index 41ed2e6..90fd83d 100644
--- a/compat-macs.el
+++ b/compat-macs.el
@@ -145,7 +145,7 @@ REST are attributes and the function BODY."
 (defmacro compat-guard (cond &rest rest)
   "Guard definition with a runtime COND and a version check.
 The runtime condition must make sure that no definition is
-overriden.  REST is an attribute plist followed by the definition
+overridden.  REST is an attribute plist followed by the definition
 body.  The attributes specify the conditions under which the
 definition is generated.
 
diff --git a/compat-tests.el b/compat-tests.el
index 88992f6..6b41482 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -2023,10 +2023,10 @@
 (ert-deftest compat-string-search ()
   ;; Find needle at the beginning of a haystack:
   (should-equal 0 (string-search "a" "abb"))
-  ;; Find needle at the begining of a haystack, with more potential
+  ;; Find needle at the beginning of a haystack, with more potential
   ;; needles that could be found:
   (should-equal 0 (string-search "a" "abba"))
-  ;; Find needle with more than one charachter at the beginning of
+  ;; Find needle with more than one character at the beginning of
   ;; a line:
   (should-equal 0 (string-search "aa" "aabbb"))
   ;; Find a needle midstring:
diff --git a/compat.texi b/compat.texi
index 696418b..3e02cb2 100644
--- a/compat.texi
+++ b/compat.texi
@@ -2680,7 +2680,7 @@ complex text shaping requires that for some scripts.  When that
 happens, characters no longer map in a simple way to display columns,
 and display layout decisions with such strings, such as truncating too
 wide strings, can be a complex job.  This function helps in performing
-suvh jobs: it splits up its argument @var{string} into a list of
+such jobs: it splits up its argument @var{string} into a list of
 substrings, where each substring produces a single grapheme cluster
 that should be displayed as a unit.  Lisp programs can then use this
 list to construct visually-valid substrings of @var{string} which will