fix(cc): gate major-mode-remap-defaults hacks behind +tree-sitter

Prevents the use of *-ts-mode's when +tree-sitter isn't enabled.
This commit is contained in:
Max-Heinrich Laves 2025-12-01 06:43:36 +01:00 committed by GitHub
parent 70a018958a
commit 139ab93fef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -45,8 +45,9 @@ This is ignored by ccls.")
;; HACK: cc-mode adds null entries to `major-mode-remap-defaults', which
;; overrides our tree-sitter remappings, causing the first remap to succeed,
;; but future remaps to fail.
(dolist (mode '(c-mode c++-mode c-or-c++-mode))
(cl-callf2 delete (list mode) major-mode-remap-defaults))
(when (modulep! +tree-sitter)
(dolist (mode '(c-mode c++-mode c-or-c++-mode))
(cl-callf2 delete (list mode) major-mode-remap-defaults)))
(set-docsets! '(c-mode c-ts-mode) "C")
(set-docsets! '(c++-mode c++-ts-mode) "C++" "Boost")