branch: elpa/rust-mode
commit e54bbae8c4c2af580b5721ad5ac151f2ad19293e
Merge: b2b18aa6c1 3592c10cc1
Author: Sibi Prabakaran <s...@psibi.in>
Commit: GitHub <nore...@github.com>
Merge pull request #539 from Dev380/fix-auto-mode-treesit
fix(treesit): auto mode precedence of rust-mode
---
rust-mode-treesitter.el | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/rust-mode-treesitter.el b/rust-mode-treesitter.el
index 21eab59f91..5f84a00616 100644
--- a/rust-mode-treesitter.el
+++ b/rust-mode-treesitter.el
@@ -13,6 +13,12 @@
(require 'treesit)
(require 'rust-ts-mode)
+ ;; HACK: `rust-ts-mode' adds itself to the `auto-mode-alist'
+ ;; after us, so we need to readd `rust-mode' to the front of
+ ;; the list after loading `rust-ts-mode'.
+ (setq auto-mode-alist (delete '("\\.rs\\'" . rust-mode) auto-mode-alist))
+ (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode))
+
(define-derived-mode rust-mode rust-ts-mode "Rust"
"Major mode for Rust code.
