Merge from origin/emacs-29

ae80192d97b ; * src/buffer.c (Fmake_indirect_buffer): Doc fix.
2549eabc97f Fix typos in vnvni.el.
647cecc853e ; * lisp/vc/vc.el (vc-clone): Fix wording of doc string.
383ccf6d51f Avoid assertion violations in bidi.c
b7cef701cb5 * lisp/files.el (hack-one-local-variable): Use `set-auto-...
05308001759 Fix infinite recursion in gdb-mi.el

2 files changed, 10 insertions, 3 deletions

diff --git a/src/bidi.c b/src/bidi.c
index a2b5054cb60..36d1a0496b8 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2908,7 +2908,6 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
     }
   else if (bidi_it->bracket_pairing_pos != eob)
     {
-      eassert (bidi_it->resolved_level == -1);
       /* If the cached state shows an increase of embedding level due
          to an isolate initiator, we need to update the 1st cached
          state of the next run of the current isolating sequence with
@@ -2917,6 +2916,7 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
       if (bidi_it->level_stack[bidi_it->stack_idx].level > prev_level
           && ISOLATE_STATUS (bidi_it, bidi_it->stack_idx))
         {
+          eassert (bidi_it->resolved_level == -1);
           bidi_record_type_for_neutral (&prev_for_neutral, prev_level, 0);
           bidi_record_type_for_neutral (&next_for_neutral, prev_level, 1);
         }
@@ -2931,6 +2931,7 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
             }
           else if (bidi_it->bracket_pairing_pos == -1)
             {
+              eassert (bidi_it->resolved_level == -1);
               /* Higher levels were not BPA-resolved yet, even if
                  cached by bidi_find_bracket_pairs.  Force application
                  of BPA to the new level now.  */
diff --git a/src/buffer.c b/src/buffer.c
index e235ff8f9f8..126f3eb055a 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -796,14 +796,20 @@ DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer,
 BASE-BUFFER should be a live buffer, or the name of an existing buffer.
 
 NAME should be a string which is not the name of an existing buffer.
+
+Interactively, prompt for BASE-BUFFER (offering the current buffer as
+the default), and for NAME (offering as default the name of a recently
+used buffer).
+
 Optional argument CLONE non-nil means preserve BASE-BUFFER's state,
 such as major and minor modes, in the indirect buffer.
-
 CLONE nil means the indirect buffer's state is reset to default values.
 
 If optional argument INHIBIT-BUFFER-HOOKS is non-nil, the new buffer
 does not run the hooks `kill-buffer-hook',
-`kill-buffer-query-functions', and `buffer-list-update-hook'.  */)
+`kill-buffer-query-functions', and `buffer-list-update-hook'.
+
+Interactively, CLONE and INHIBIT-BUFFER-HOOKS are nil.  */)
   (Lisp_Object base_buffer, Lisp_Object name, Lisp_Object clone,
    Lisp_Object inhibit_buffer_hooks)
 {