Merge from origin/emacs-29

2773cf9e013 ; Fix typos
020aff95fa3 ; Fix typos in ChangeLog files
5e03a621efc ; * lisp/progmodes/c-ts-mode.el (c-ts-mode--else-heuristi...
f0734e1c0d1 Fix c-ts-mode indent heuristic (bug#67417)
08fc6bace20 Fix c-ts-mode indentation (bug#67357)
71bc2815ccd Add font-locking for hash-bang lines in typescript-ts-mode.
db8347c8c87 Add font-locking for hash-bang lines in js-ts-mode
91f2ade57bb ruby-mode: Better detect regexp vs division (bug#67569)

5 files changed, 9 insertions, 9 deletions

diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index b1e476e56fd..7e21ca3ed30 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -2029,7 +2029,7 @@
         (update_frame_tool_bar): Calculate tool-bar style once per call.
         Instead of hiding text labels, omit them.  Don't use
         xg_show_toolbar_item; create new GtkToolItems from scratch if
-        necessary, instead of trying to re-use them.  This avoids an
+        necessary, instead of trying to reuse them.  This avoids an
         annoying animation when changing tool-bars.
 
 2010-12-31  Jan Djärv  <jan.h.d@swipnet.se>
@@ -2048,7 +2048,7 @@
         (ns_set_name): Call ns_set_name_internal.
         (x_explicitly_set_name): Remove call to ns_set_name_iconic.
         (x_implicitly_set_name): Ditto.
-        (x_set_title): Remove commet about EXPLICIT.  Call ns_set_name_internal.
+        (x_set_title): Remove comment about EXPLICIT.  Call ns_set_name_internal.
         (ns_set_name_as_filename): Encode name with ENCODE_UTF_8 (Bug#7517).
 
 2010-12-29  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
@@ -9435,7 +9435,7 @@
         continuation line, and start looking for a suitable row from
         there.
 
-        * term.c (append_glyph): Reverse glyphs by pre-pending them,
+        * term.c (append_glyph): Reverse glyphs by prepending them,
         rather than appending, if the glyph_row's reversed_p flag is set.
         Set the resolved_level and bidi_type members of each glyph.
 
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index d9736479a04..2f44ba02d98 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -5464,7 +5464,7 @@
         (set_horizontal_scroll_bar): New function.
         (redisplay_window): Set ignore_mouse_drag_p when tool bar has
         more than one line.  Handle horizontal scroll bars.
-        (note_mouse_highlight): Handle horizontal scrol bars.
+        (note_mouse_highlight): Handle horizontal scroll bars.
         (expose_frame): Set dimensions of XRectangle from frame's text
         sizes.
         (Vvoid_text_area_pointer): Update doc-string.
@@ -8437,7 +8437,7 @@
 
         * xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
 
-        * keyboard.c (Frecursive_edit): Say more precicely how throwing
+        * keyboard.c (Frecursive_edit): Say more precisely how throwing
         `exit' works (bug#15865).
 
 2014-02-07  Martin Rudalics  <rudalics@gmx.at>
@@ -16678,7 +16678,7 @@
 
 2013-05-27  Eli Zaretskii  <eliz@gnu.org>
 
-        * xdisp.c (pos_visible_p): When CHARPOS is displayed frrom a
+        * xdisp.c (pos_visible_p): When CHARPOS is displayed from a
         display vector, and we backtrack, handle the case that the
         previous character position is also displayed from a display
         vector or covered by a display string or image.  (Bug#14476)
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 1f479a89ed8..f50b8d134c3 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -10802,7 +10802,7 @@
         (display_mode_element): Ditto.
         (echo_area_display): Don't display if frame has no pools yet.
         (echo_area_display): Work with window matrix for mini window.
-        (redisplay_window): Use window marix for mini window.
+        (redisplay_window): Use window matrix for mini window.
         (display_text_line): Assume HPOS and VPOS are window relative and
         use that for DISPLAY_STRING.
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index d005b51604b..09210f8eea9 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -11622,7 +11622,7 @@
         (set_font_frame_param): If `font' is specified in lface, use it.
         (Finternal_get_lisp_face_attribute): Handle `font' slot in lface.
         (lface_same_font_attributes_p): Likewise.
-        (make_realized_face): Arguent changed.  Caller changed.  Set
+        (make_realized_face): Argument changed.  Caller changed.  Set
         face->ascii_face to face itself.
         (free_realized_face): Free face->fontset if face is for ASCII.
         (face_suitable_for_iso8859_1_p, face_suitable_for_charset_p)
diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 461c9d6d899..9a87820f82b 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -6259,7 +6259,7 @@ symbol_to_drag_action (Lisp_Object act)
   if (NILP (act))
     return GDK_ACTION_DEFAULT;
 
-  signal_error ("Invalid drag acction", act);
+  signal_error ("Invalid drag action", act);
 }
 
 static Lisp_Object