emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 4f44c56c867: Revert "; * lisp/progmodes/c-ts-mode.el: allow loadi


From: Eli Zaretskii
Subject: master 4f44c56c867: Revert "; * lisp/progmodes/c-ts-mode.el: allow loading file without treesit"
Date: Tue, 2 May 2023 08:43:50 -0400 (EDT)

branch: master
commit 4f44c56c867b99bc7b813d8b104b9939479f86f2
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Revert "; * lisp/progmodes/c-ts-mode.el: allow loading file without treesit"
    
    This reverts commit 7d246c359cf3d25cab5134076e393c4d25015827.
    The same problem was already fixed on the release branch,and this
    change will just cause merge conflicts.
---
 lisp/progmodes/c-ts-mode.el | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 1f420689432..4971ed0b7c2 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1001,14 +1001,13 @@ For BOL see `treesit-simple-indent-rules'."
       (looking-at c-ts-mode--for-each-tail-regexp))))
 
 (defvar c-ts-mode--emacs-c-range-query
-  (and (treesit-available-p)
-       (treesit-query-compile
-        'emacs-c `(((declaration
-                     type: (macro_type_specifier
-                            name: (identifier) @_name)
-                     @for-each-tail)
-                    (:match ,c-ts-mode--for-each-tail-regexp
-                            @_name)))))
+  (treesit-query-compile
+   'emacs-c `(((declaration
+                type: (macro_type_specifier
+                       name: (identifier) @_name)
+                @for-each-tail)
+               (:match ,c-ts-mode--for-each-tail-regexp
+                       @_name))))
   "Query that finds a FOR_EACH_* macro with an unbracketed body.")
 
 (defvar-local c-ts-mode--for-each-tail-ranges nil



reply via email to

[Prev in Thread] Current Thread [Next in Thread]