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)

1 files changed, 3 insertions, 3 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.