Merge remote-tracking branch 'origin/master' into feature/android

5 files changed, 23 insertions, 10 deletions

diff --git a/src/bidi.c b/src/bidi.c
index e01251263be..93875d243e4 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -3300,12 +3300,15 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
      it belongs to a sequence of WS characters preceding a newline
      or a TAB or a paragraph separator.  */
   if ((bidi_it->orig_type == NEUTRAL_WS
-       || bidi_it->orig_type == WEAK_BN
+       || (bidi_it->orig_type == WEAK_BN
+           /* If this BN character is already at base level, we don't
+              need to consider resetting it, since I1 and I2 below
+              will not change the level, so avoid the potentially
+              costly loop below.  */
+           && level != bidi_it->level_stack[0].level)
        || bidi_isolate_fmt_char (bidi_it->orig_type))
-      && bidi_it->next_for_ws.charpos < bidi_it->charpos
-      /* If this character is already at base level, we don't need to
-         reset it, so avoid the potentially costly loop below.  */
-      && level != bidi_it->level_stack[0].level)
+      /* This means the informaition about WS resolution is not valid.  */
+      && bidi_it->next_for_ws.charpos < bidi_it->charpos)
     {
       int ch;
       ptrdiff_t clen = bidi_it->ch_len;
@@ -3340,7 +3343,7 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
       || bidi_it->orig_type == NEUTRAL_S
       || bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB
       || ((bidi_it->orig_type == NEUTRAL_WS
-           || bidi_it->orig_type == WEAK_BN
+           || bidi_it->orig_type == WEAK_BN /* L1/Retaining */
            || bidi_isolate_fmt_char (bidi_it->orig_type)
            || bidi_explicit_dir_char (bidi_it->ch))
           && (bidi_it->next_for_ws.type == NEUTRAL_B
diff --git a/src/buffer.c b/src/buffer.c
index 88ca69b0dd8..38648519ba0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5081,8 +5081,8 @@ the mode line appears at the bottom.  */);
 The header line appears, optionally, at the top of a window; the mode
 line appears at the bottom.
 
-Also see `header-line-indent-mode' if `display-line-number-mode' is
-used.  */);
+Also see `header-line-indent-mode' if `display-line-numbers-mode' is
+turned on and header-line text should be aligned with buffer text.  */);
 
   DEFVAR_PER_BUFFER ("mode-line-format", &BVAR (current_buffer, mode_line_format),
                      Qnil,
diff --git a/src/eval.c b/src/eval.c
index d42f7ffe894..e377e30c6fb 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2348,6 +2348,8 @@ it defines a macro.  */)
 }
 
 
+static Lisp_Object list_of_t;  /* Never-modified constant containing (t).  */
+
 DEFUN ("eval", Feval, Seval, 1, 2, 0,
        doc: /* Evaluate FORM and return its value.
 If LEXICAL is t, evaluate using lexical scoping.
@@ -2357,7 +2359,7 @@ alist mapping symbols to their value.  */)
 {
   specpdl_ref count = SPECPDL_INDEX ();
   specbind (Qinternal_interpreter_environment,
-            CONSP (lexical) || NILP (lexical) ? lexical : list1 (Qt));
+            CONSP (lexical) || NILP (lexical) ? lexical : list_of_t);
   return unbind_to (count, eval_sub (form));
 }
 
@@ -4392,6 +4394,9 @@ alist of active lexical bindings.  */);
   Qcatch_all_memory_full
     = Fmake_symbol (build_pure_c_string ("catch-all-memory-full"));
 
+  staticpro (&list_of_t);
+  list_of_t = list1 (Qt);
+
   defsubr (&Sor);
   defsubr (&Sand);
   defsubr (&Sif);
diff --git a/src/treesit.c b/src/treesit.c
index 8e772523cc7..b15d44fca01 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -620,7 +620,7 @@ treesit_load_language (Lisp_Object language_symbol,
   char *c_name = xstrdup (SSDATA (base_name));
   treesit_symbol_to_c_name (c_name);
   if (found_override)
-    c_name = SSDATA (override_c_name);
+    c_name = xstrdup (SSDATA (override_c_name));
   langfn = dynlib_sym (handle, c_name);
   xfree (c_name);
   error = dynlib_error ();
diff --git a/src/xdisp.c b/src/xdisp.c
index 8082534c0a9..8bbb80b1c8c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29385,6 +29385,7 @@ fill_gstring_glyph_string (struct glyph_string *s, int face_id,
                            int start, int end, int overlaps)
 {
   struct glyph *glyph, *last;
+  int voffset;
   Lisp_Object lgstring;
   int i;
   bool glyph_not_available_p;
@@ -29392,6 +29393,7 @@ fill_gstring_glyph_string (struct glyph_string *s, int face_id,
   s->for_overlaps = overlaps;
   glyph = s->row->glyphs[s->area] + start;
   last = s->row->glyphs[s->area] + end;
+  voffset = glyph->voffset;
   glyph_not_available_p = glyph->glyph_not_available_p;
   s->cmp_id = glyph->u.cmp.id;
   s->cmp_from = glyph->slice.cmp.from;
@@ -29442,6 +29444,9 @@ fill_gstring_glyph_string (struct glyph_string *s, int face_id,
   if (glyph_not_available_p)
     s->font_not_found_p = true;
 
+  /* Adjust base line for subscript/superscript text.  */
+  s->ybase += voffset;
+
   return glyph - s->row->glyphs[s->area];
 }