Merge from origin/emacs-30

74a972cace6 Skip proced refine tests on Darwin
c50ce03afc1 ; Fix recent additions to the manuals
c818c5bbafd ; * lisp/term/w32-win.el (tree-sitter--library-abi): Decl...
b71d3b2f52f ; Better clarify function types in C-h f (bug#73626)
59b3eae481d ; Introduce type specifiers to the elisp manual (bug#73626)
83fc3cf53a4 Future-proof loading tree-sitter library on MS-Windows
3eb30186825 ; Improve documentation of 'category' in display-buffer a...
4d80c4f4858 ; More accurate documentation of 'set-mark-command'
70dd5705e11 Fix overriding 'c-ts-mode' by 'c-mode'
331610aef05 ; Improve vc-dir help-echo
9c484d51012 ; Avoid assertion violations in "temacs -Q"
8dc9dfdc381 lisp/progmodes/c-ts-mode.el: Demote loading c-ts-mode as ...
426bce8a675 ; In PROBLEMS mention issue with .Xresources on Gnome des...

2 files changed, 12 insertions, 1 deletions

diff --git a/src/lread.c b/src/lread.c
index ea0398196e3..c25ffb3c4fe 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2309,7 +2309,7 @@ build_load_history (Lisp_Object filename, bool entire)
   if (entire || !foundit)
     {
       Lisp_Object tem = Fnreverse (Vcurrent_load_list);
-      eassert (EQ (filename, Fcar (tem)));
+      eassert (!NILP (Fequal (filename, Fcar (tem))));
       Vload_history = Fcons (tem, Vload_history);
       /* FIXME: There should be an unbind_to right after calling us which
          should re-establish the previous value of Vcurrent_load_list.  */
diff --git a/src/treesit.c b/src/treesit.c
index 6677158b9de..5e1e9b01059 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -4516,4 +4516,15 @@ applies to LANGUAGE-A will be redirected to LANGUAGE-B instead.  */);
   defsubr (&Streesit_subtree_stat);
 #endif /* HAVE_TREE_SITTER */
   defsubr (&Streesit_available_p);
+#ifdef WINDOWSNT
+  DEFSYM (Qtree_sitter__library_abi, "tree-sitter--library-abi");
+  Fset (Qtree_sitter__library_abi,
+#if HAVE_TREE_SITTER
+        make_fixnum (TREE_SITTER_LANGUAGE_VERSION)
+#else
+        make_fixnum (-1)
+#endif
+        );
+#endif
+
 }