Merge from origin/emacs-30

df3fb94f091 Insert missing step to make use of directory tracking OSC...
1bed2949583 * lisp/keymap.el (keymap-set): Refer to 'key-description'...
941158fc133 Support new tree-sitter grammar filename format (bug#78754)
888f846d377 Fix crash when evaluating "(signal nil 5)" (bug#78738)
51b9e92ab8e Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
c0a913ea4f3 ; * doc/lispref/modes.texi (Font Lock Basics): Remove old...
37de076017a Adapt emba integration (don't merge)

2 files changed, 18 insertions, 3 deletions

diff --git a/src/eval.c b/src/eval.c
index fbb881d682d..46705dc4543 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1888,7 +1888,7 @@ See also the function `condition-case'.  */
   (Lisp_Object error_symbol, Lisp_Object data)
 {
   /* If they call us with nonsensical arguments, produce "peculiar error".  */
-  if (NILP (error_symbol) && NILP (data))
+  if (NILP (error_symbol) && !CONSP (data))
     error_symbol = Qerror;
   signal_or_quit (error_symbol, data, false);
   eassume (false);
diff --git a/src/treesit.c b/src/treesit.c
index 7fbe331c234..7b8e5d161f7 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -682,14 +682,29 @@ treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
       Lisp_Object candidate1 = concat2 (lib_base_name, XCAR (suffixes));
 #ifndef WINDOWSNT
       /* On Posix hosts, support libraries named with ABI version
-         numbers.  In the foreseeable future we only need to support
-         version 0.0.  For more details, see
+         numbers.  Originally tree-sitter grammars are always versioned
+         at 0.0, so we first try that.  For more details, see
          https://lists.gnu.org/archive/html/emacs-devel/2023-04/msg00386.html.  */
       Lisp_Object candidate2 = concat2 (candidate1, Vtreesit_str_dot_0);
       Lisp_Object candidate3 = concat2 (candidate2, Vtreesit_str_dot_0);
 
       *path_candidates = Fcons (candidate3, *path_candidates);
       *path_candidates = Fcons (candidate2, *path_candidates);
+
+      /* Since 2025, tree-sitter grammars use their supported
+         TREE_SITTER_LANGUAGE_VERSION as the major version.  So we need
+         to try all the version supported by the tree-sitter library
+         too.  (See bug#78754)  */
+      for (int version = TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION;
+           version <= TREE_SITTER_LANGUAGE_VERSION;
+           version++)
+        {
+          char ext[16]; // 16 should be enough until the end of universe.
+          snprintf ((char *) &ext, 16, ".%d.0", version);
+          Lisp_Object versioned_candidate = concat2 (candidate1,
+                                                     build_string (ext));
+          *path_candidates = Fcons (versioned_candidate, *path_candidates);
+        }
 #endif
       *path_candidates = Fcons (candidate1, *path_candidates);
     }