emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(cc): disable modern-cpp-font-lock if +tree-sitter

Browse source 
Fix: #7941
This commit is contained in:
Henrik Lissner 2024-07-11 23:32:05 -04:00
parent 76845a2ea8
commit b0e1e68e78
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/lang/cc/README.org
View file

@ -35,7 +35,7 @@ This module adds support for the C-family of languages: C, C++, and Objective-C.
- [[doom-package:demangle-mode]]
- [[doom-package:disaster]]
- [[doom-package:glsl-mode]]
- [[doom-package:modern-cpp-font-lock]]
- [[doom-package:modern-cpp-font-lock]] unless [[doom-module:+tree-sitter]]
- [[doom-package:opencl-mode]]
- if [[doom-module:+lsp]]
- [[doom-package:ccls]] if [[doom-module::tools lsp -eglot]]

1
modules/lang/cc/config.el
View file

@ -135,6 +135,7 @@ This is ignored by ccls.")
(use-package! modern-cpp-font-lock
:unless (modulep! +tree-sitter)
:hook (c++-mode . modern-c++-font-lock-mode))

3
modules/lang/cc/packages.el
View file

@ -7,7 +7,8 @@
(package! cuda-mode :pin "7f593518fd135fc6af994024bcb47986dfa502d2")
(package! demangle-mode :pin "04f545adab066708d6151f13da65aaf519f8ac4e")
(package! disaster :pin "16bba9afb92aacf06c088c29ba47813b65a80d87")
(package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c")
(unless (modulep! +tree-sitter)
(package! modern-cpp-font-lock :pin "43c6b68ff58fccdf9deef11674a172e4eaa8455c"))
(package! opencl-mode :pin "10ae7742d57ae79d96cf52753800b3490589b3f6")
(when (package! glsl-mode :pin "9b2e5f28e489a1f73c4aed734105618ac0dc0c43")