Merge from origin/emacs-29

0f5e74f1734 ruby-ts-mode: Highlight method and block parameters
f1aa306f915 ruby-ts-mode: Highlight variable assignments
089b08eb3eb ruby-ts-mode: Move 'self' and 'super' from constants to k...
7ede600273c (ruby-ts-mode): Split font-lock feature 'builtin' into two
ec172d748f3 Avoid assertion violation due to fill-column indicator face
62c2963ce60 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
2e6070f16c4 ; Another review of etc/NEWS
16eca92415b ; * src/gnutls.c (Fgnutls_deinit): Fix typo in doc string...
4753b587868 * lisp/cedet/semantic/symref/grep.el: Support ts-modes (b...
8a18369afdc ; Another fix for doc strings of 2 treesit.el functions
3fc68833517 ; Fix the doc strings of 2 treesit.el functions
83ce7c861e1 Make 'toml-ts-mode' optional

# Conflicts:
#	etc/NEWS

2 files changed, 10 insertions, 7 deletions

diff --git a/src/gnutls.c b/src/gnutls.c
index 8320c928a4e..e8528381efd 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1072,7 +1072,7 @@ usage: (gnutls-error-string ERROR)  */)
 
 DEFUN ("gnutls-deinit", Fgnutls_deinit, Sgnutls_deinit, 1, 1, 0,
        doc: /* Deallocate GnuTLS resources associated with process PROC.
-See also `gnutls-init'.  */)
+See also `gnutls-boot'.  */)
   (Lisp_Object proc)
 {
   return emacs_gnutls_deinit (proc);
diff --git a/src/xdisp.c b/src/xdisp.c
index 66c72aea6da..2e962b011a6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23322,8 +23322,9 @@ extend_face_to_end_of_line (struct it *it)
           it->avoid_cursor_p = true;
           it->object = Qnil;
 
-          const int stretch_ascent = (((it->ascent + it->descent)
-                                       * FONT_BASE (font)) / FONT_HEIGHT (font));
+          const int stretch_height = it->ascent + it->descent;
+          const int stretch_ascent =
+            (stretch_height * FONT_BASE (font)) / FONT_HEIGHT (font);
 
           if (indicator_column >= 0
               && indicator_column > it->current_x
@@ -23343,8 +23344,7 @@ extend_face_to_end_of_line (struct it *it)
               if (stretch_width > 0)
                 {
                   append_stretch_glyph (it, Qnil, stretch_width,
-                                        it->ascent + it->descent,
-                                        stretch_ascent);
+                                        stretch_height, stretch_ascent);
                 }
 
               /* Generate the glyph indicator only if
@@ -23352,6 +23352,8 @@ extend_face_to_end_of_line (struct it *it)
               if (it->current_x < indicator_column)
                 {
                   const int save_face_id = it->face_id;
+                  const int save_ascent = it->ascent;
+                  const int save_descent = it->descent;
                   it->char_to_display
                     = XFIXNAT (Vdisplay_fill_column_indicator_character);
                   it->face_id
@@ -23359,6 +23361,8 @@ extend_face_to_end_of_line (struct it *it)
                                    0, extend_face_id);
                   PRODUCE_GLYPHS (it);
                   it->face_id = save_face_id;
+                  it->ascent = save_ascent;
+                  it->descent = save_descent;
                 }
             }
 
@@ -23372,8 +23376,7 @@ extend_face_to_end_of_line (struct it *it)
                 {
                   clear_position (it);
                   append_stretch_glyph (it, Qnil, stretch_width,
-                                        it->ascent + it->descent,
-                                        stretch_ascent);
+                                        stretch_height, stretch_ascent);
                 }
             }