awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(cc): treesit modes not remapped to

Browse Source 
c-ts-mode and c++-ts-mode weren't being remapped to from c-mode/c++-mode
because of extra noise in `major-mode-remap-defaults`. I wish these
packages would leave these variables alone and leave it to the user to
configure; they're often inconsistent and overbearing.
This commit is contained in:
Henrik Lissner
2025-05-15 18:31:55 +02:00
parent 5be0df24d3
commit 8931c48913
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/lang/cc/config.el
View File

@ -41,7 +41,7 @@ This is ignored by ccls.")
(set-electric! '(c-mode c++-mode objc-mode java-mode (set-electric! '(c-mode c++-mode objc-mode java-mode
c-ts-mode c++-ts-mode java-ts-mode) c-ts-mode c++-ts-mode java-ts-mode)
:chars '(?\n ?\} ?\{)) :chars '(?\n ?\} ?\{))
(set-rotate-patterns! 'c++-mode (set-rotate-patterns! '(c++-mode c++-ts-mode)
:symbols '(("public" "protected" "private") :symbols '(("public" "protected" "private")
("class" "struct"))) ("class" "struct")))
(set-ligatures! '(c-mode c-ts-mode c++-mode c++-ts-mode) (set-ligatures! '(c-mode c-ts-mode c++-mode c++-ts-mode)
@ -70,7 +70,9 @@ This is ignored by ccls.")
(dolist (mode '((c++-mode . c++-ts-mode) (dolist (mode '((c++-mode . c++-ts-mode)
(c-mode . c-ts-mode) (c-mode . c-ts-mode)
(c-or-c++-mode . c-or-c++-ts-mode))) (c-or-c++-mode . c-or-c++-ts-mode)))
(cl-callf2 delete mode major-mode-remap-defaults)) (cl-callf2 delete mode major-mode-remap-defaults)
(cl-callf2 delete (list (car mode)) major-mode-remap-defaults)
(cl-callf2 rassq-delete-all (cdr mode) auto-mode-alist))
;; HACK Suppress 'Args out of range' error in when multiple modifications are ;; HACK Suppress 'Args out of range' error in when multiple modifications are
;; performed at once in a `c++-mode' buffer, e.g. with `iedit' or ;; performed at once in a `c++-mode' buffer, e.g. with `iedit' or
@ -142,7 +144,7 @@ This is ignored by ccls.")
(use-package! glsl-mode (use-package! glsl-mode
:defer t :defer t
:init :init
(when (modulep! +tree-sitter) ; 29+ only (when (modulep! +tree-sitter)
(set-tree-sitter! 'glsl-mode 'glsl-ts-mode (set-tree-sitter! 'glsl-mode 'glsl-ts-mode
'((glsl :url "https://github.com/tree-sitter-grammars/tree-sitter-glsl")))) '((glsl :url "https://github.com/tree-sitter-grammars/tree-sitter-glsl"))))
:config :config