diff options
| author | tslilc <tslil@posteo.de> | 2025-10-22 20:55:27 +0100 |
|---|---|---|
| committer | tslilc <tslil@posteo.de> | 2025-10-22 20:55:27 +0100 |
| commit | 3962882aa4f63c382153513ac22c2808785e059d (patch) | |
| tree | b8e7a98b36cf6b217519ac443ade7046ab076b32 | |
| parent | 8df07965a7280bcfba4e26615b97356120007edc (diff) | |
[emacs] try to fix rust-mode vs rust-ts-mode
| -rw-r--r-- | emacs/inits/20-programming.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el index 6bd500b..13eff16 100644 --- a/emacs/inits/20-programming.el +++ b/emacs/inits/20-programming.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2025-07-08 20h10 BST (anker)> +;; Time-stamp: <2025-10-22 20h53 BST (65b14275)> ;; ----------------------------------------------------------------------------- ;; General setup @@ -32,7 +32,7 @@ :custom (treesit-auto-install 'prompt) :config - (treesit-auto-add-to-auto-mode-alist 'all) + (setq treesit-auto-langs '(python)) (global-treesit-auto-mode)) (use-package centered-window @@ -243,7 +243,9 @@ (use-package rust-mode :ensure :defer - :bind (:map rust-ts-mode-map + :init + (setq rust-mode-treesitter-derive t) + :bind (:map rust-mode-map ("M-," . lh-backward-delim) ("M-." . lh-forward-delim) ("M-m" . lh-matching-delim) @@ -251,12 +253,12 @@ ("M-n" . end-of-defun) ("C-c r c" . rust-compile) ("C-c r r" . rust-run)) - :hook (rust-ts-mode . (lambda () - (cargo-minor-mode) - ;; Pair {} in rust format strings ... ? - (setq-local electric-pair-text-pairs - (cons '(?{ . ?}) electric-pair-pairs)) - (eglot-ensure))) + :hook (rust-mode . (lambda () + (cargo-minor-mode) + ;; Pair {} in rust format strings ... ? + (setq-local electric-pair-text-pairs + (cons '(?{ . ?}) electric-pair-pairs)) + (eglot-ensure))) :config (setq rust-indent-offset 4 rust-indent-method-chain t |