diff options
| author | Sibi Prabakaran <sibi@psibi.in> | 2024-02-28 09:08:15 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-28 09:08:15 +0530 |
| commit | a8f94697acbd9d71ec94b79a30685899e9c31c6a (patch) | |
| tree | f8beee744d57799526384489a9130a406872e65c | |
| parent | 73e6e4ef891affba87d08021cbc25cdc084ce290 (diff) | |
| parent | b288e2d97eb54763271ddfc3f1483a899f949271 (diff) | |
| download | rust-mode-a8f94697acbd9d71ec94b79a30685899e9c31c6a.tar.gz | |
Merge pull request #521 from rust-lang/treesit-old-emacs
Fix tree-sitter integration for older emacs
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | rust-mode-treesitter.el | 18 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Changelog.md b/Changelog.md index a506866..cab2398 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,3 +2,4 @@ - Add support for treesitter mode. - Fix warnings resulting from rust-utils.el. [Fixes #509](https://github.com/rust-lang/rust-mode/issues/509). +- Fix tree sitter mode with hooks integraiton. [Fixes #516](https://github.com/rust-lang/rust-mode/issues/516). diff --git a/rust-mode-treesitter.el b/rust-mode-treesitter.el index 3c3bd57..dbad06a 100644 --- a/rust-mode-treesitter.el +++ b/rust-mode-treesitter.el @@ -6,17 +6,21 @@ ;;; Code: ;;;###autoload -(require 'treesit) -(require 'rust-ts-mode) +(when (version<= "29.1" emacs-version) + ;; We have the when macro because of + ;; https://github.com/rust-lang/rust-mode/issues/520 + (require 'treesit) + (require 'rust-ts-mode) + (require 'rust-common) -(define-derived-mode rust-mode rust-ts-mode "Rust" - "Major mode for Rust code. + (define-derived-mode rust-mode rust-ts-mode "Rust" + "Major mode for Rust code. \\{rust-mode-map}" - :group 'rust-mode + :group 'rust-mode - (add-hook 'before-save-hook rust-before-save-hook nil t) - (add-hook 'after-save-hook rust-after-save-hook nil t)) + (add-hook 'before-save-hook rust-before-save-hook nil t) + (add-hook 'after-save-hook rust-after-save-hook nil t))) (provide 'rust-mode-treesitter) ;;; rust-mode-treesitter.el ends here |