Merge from savannah/emacs-30

1ee8579eb7d Fix bug#72255
05629d3af0a Delete redundant "a.k.a." in use-package.texi
c7609464f70 Document (use-package 'emacs) declarations
de9f9add138 Improve 'emacs-news-view-mode' menus and bindings
7588e1f8a9f ; * src/xdisp.c (Fformat_mode_line): Doc fix.
2074e94c3b1 Fix disappearing bar cursor on Hebrew text (bug#72230)
1aaadc8aec5 Fix DocView with DVI files
c1382257aa8 ; Fix typo in use-package.texi
caf7426f0ca FIx spurious fontification of variable in Java Mode
9b426e15abd Correctly typeset nil and t in texinfo
f050b9c5033 Fix Tramp IPv6 handling in tests
46b192c04b1 Update to Org 9.7.8-5-gfdf0e0
87f41b937bc Fix Ftreesit_parser_create

4 files changed, 20 insertions, 22 deletions

diff --git a/src/image.c b/src/image.c
index 90e6312e128..94404c09895 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1328,11 +1328,11 @@ struct image_type
      image type.  Value is true if SPEC is valid.  */
   bool (*valid_p) (Lisp_Object spec);
 
-  /* Load IMG which is used on frame F from information contained in
-     IMG->spec.  Value is true if successful.  */
+  /* Load IMG which is to be used on frame F from information contained
+     in IMG->spec.  Value is true if successful.  */
   bool (*load_img) (struct frame *f, struct image *img);
 
-  /* Free resources of image IMG which is used on frame F.  */
+  /* Free such resources of image IMG as are used on frame F.  */
   void (*free_img) (struct frame *f, struct image *img);
 
 #ifdef WINDOWSNT
@@ -4154,16 +4154,16 @@ image_destroy_x_image (Emacs_Pix_Container pimg)
   eassert (input_blocked_p ());
   if (pimg)
     {
-#ifdef USE_CAIRO
-#endif  /* USE_CAIRO */
+#if defined USE_CAIRO || defined HAVE_HAIKU || defined HAVE_NS
+      /* On these systems, Emacs_Pix_Containers always point to the same
+         data as pixmaps in `struct image', and therefore must never be
+         freed separately.  */
+#endif  /* USE_CAIRO || HAVE_HAIKU || HAVE_NS */
 #ifdef HAVE_NTGUI
       /* Data will be freed by DestroyObject.  */
       pimg->data = NULL;
       xfree (pimg);
 #endif /* HAVE_NTGUI */
-#ifdef HAVE_NS
-      ns_release_object (pimg);
-#endif /* HAVE_NS */
     }
 #endif
 }
diff --git a/src/nsterm.m b/src/nsterm.m
index 794630de1c1..2aadada2df6 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3026,7 +3026,7 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
      Note that CURSOR_WIDTH is meaningful only for (h)bar cursors.
    -------------------------------------------------------------------------- */
 {
-  NSRect r, s;
+  NSRect r;
   int fx, fy, h, cursor_height;
   struct frame *f = WINDOW_XFRAME (w);
   struct glyph *phys_cursor_glyph;
@@ -3076,6 +3076,12 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
       /* The bar cursor should never be wider than the glyph.  */
       if (cursor_width < w->phys_cursor_width)
         w->phys_cursor_width = cursor_width;
+
+      /* If the character under cursor is R2L, draw the bar cursor
+         on the right of its glyph, rather than on the left.  */
+      cursor_glyph = get_phys_cursor_glyph (w);
+      if ((cursor_glyph->resolved_level & 1) != 0)
+        fx += cursor_glyph->pixel_width - w->phys_cursor_width;
     }
   /* If we have an HBAR, "cursor_width" MAY specify height.  */
   else if (cursor_type == HBAR_CURSOR)
@@ -3126,18 +3132,8 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
       [ctx restoreGraphicsState];
       break;
     case HBAR_CURSOR:
-      NSRectFill (r);
-      [ctx restoreGraphicsState];
-      break;
     case BAR_CURSOR:
-      s = r;
-      /* If the character under cursor is R2L, draw the bar cursor
-         on the right of its glyph, rather than on the left.  */
-      cursor_glyph = get_phys_cursor_glyph (w);
-      if ((cursor_glyph->resolved_level & 1) != 0)
-        s.origin.x += cursor_glyph->pixel_width - s.size.width;
-
-      NSRectFill (s);
+      NSRectFill (r);
       [ctx restoreGraphicsState];
       break;
     }
diff --git a/src/treesit.c b/src/treesit.c
index baa1b8dfd11..45db71bb5fd 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1457,7 +1457,9 @@ an indirect buffer.  */)
   ts_parser_set_language (parser, lang);
 
   /* Create parser.  */
-  Lisp_Object lisp_parser = make_treesit_parser (Fcurrent_buffer (),
+  Lisp_Object lisp_buf;
+  XSETBUFFER (lisp_buf, buf);
+  Lisp_Object lisp_parser = make_treesit_parser (lisp_buf,
                                                  parser, NULL,
                                                  language, tag);
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 4185e368c96..45317cc9f5d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28160,7 +28160,7 @@ store_mode_line_string (const char *string, Lisp_Object lisp_string,
 
 DEFUN ("format-mode-line", Fformat_mode_line, Sformat_mode_line,
        1, 4, 0,
-       doc: /* Format a string out of a mode line format specification.
+       doc: /* Return a string formatted according to mode-line format specification.
 First arg FORMAT specifies the mode line format (see `mode-line-format'
 for details) to use.