[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 6dcd7de02aa: Merge from origin/emacs-29
|
From: |
Eli Zaretskii |
|
Subject: |
master 6dcd7de02aa: Merge from origin/emacs-29 |
|
Date: |
Sat, 27 Apr 2024 15:21:38 -0400 (EDT) |
branch: master
commit 6dcd7de02aa1671f6aa56f7a754b63e809ca8c99
Merge: f5439a92910 cf839129ce0
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
Merge from origin/emacs-29
cf839129ce0 Fix last change
3e68d413c1c ; Skip 'csharp-ts-mode' test if grammar is missing
---
test/lisp/progmodes/csharp-mode-tests.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/test/lisp/progmodes/csharp-mode-tests.el
b/test/lisp/progmodes/csharp-mode-tests.el
index 2878fa601f2..af06a918f6e 100644
--- a/test/lisp/progmodes/csharp-mode-tests.el
+++ b/test/lisp/progmodes/csharp-mode-tests.el
@@ -27,6 +27,7 @@
(ert-test-erts-file (ert-resource-file "indent.erts")))
(ert-deftest csharp-ts-mode-test-indentation ()
+ (skip-unless (treesit-ready-p 'c-sharp t))
(ert-test-erts-file (ert-resource-file "indent-ts.erts")))
(provide 'csharp-mode-tests)