Merge from origin/emacs-29

033071692c7 ; Fix typos
f4a513344d9 Add lambda_expression-rule to java-ts-mode (bug#60091)
546aed35434 eglot: Add support for new language server csharp-ls
cb761eb7ac4 Use the new tree-sitter commands
037407ad95a Add "function" feature to python-ts-mode (bug#59977)
fee2efe1b03 Add go-ts-mode and go-mod-ts-mode (Bug#60025)
e8f7ab67ad1 Add basic support for hideshow in python-ts-mode (bug#60044)
cac070b23e4 Add "this" keyword to java-ts-mode (bug#60086)
c8d75046a2f When completing relative project file names, use relative...
3b618d0e3ed Avoid segfaults due to invalid selected-window's buffer

# Conflicts:
#	lisp/progmodes/sh-script.el

3 files changed, 3 insertions, 3 deletions

diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 7f77c0ca077..f455c4de382 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -10836,7 +10836,7 @@
         * gtkutil.c (xg_maybe_add_timer): Port to higher-res time stamps.
 
         * image.c (prepare_image_for_display, clear_image_cache)
-        (lookup_image): Port to higer-resolution time stamps.
+        (lookup_image): Port to higher-resolution time stamps.
 
         * keyboard.c (start_polling, bind_polling_period):
         Check for time stamp overflow.
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 91f8005ac51..0c4e2909ced 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -10579,7 +10579,7 @@
         (../src/$(OLDXMENU), $(OLDXMENU)): Remove.
         (temacs$(EXEEXT)): Depend on $(LIBXMENU), not stamp-oldxmenu.
         ($(lwlibdir)/liblw.a, $(oldXMenudir)/libXMenu11.a, FORCE): New targets.
-        (boostrap-clean): No need to remove stamp-oldxmenu.
+        (bootstrap-clean): No need to remove stamp-oldxmenu.
 
         Fix recently introduced bool vector overrun.
         This was due to an optimization that went awry.
diff --git a/src/fns.c b/src/fns.c
index d8744c1a4de..b6e871ad49c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3938,7 +3938,7 @@ system.
 If the region can't be decoded, signal an error and don't modify the buffer.
 Optional third argument BASE64URL determines whether to use the URL variant
 of the base 64 encoding, as defined in RFC 4648.
-If optional fourth argument INGORE-INVALID is non-nil invalid characters
+If optional fourth argument IGNORE-INVALID is non-nil invalid characters
 are ignored instead of signaling an error.  */)
      (Lisp_Object beg, Lisp_Object end, Lisp_Object base64url,
       Lisp_Object ignore_invalid)