[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/rust-mode a8f94697ac 4/4: Merge pull request #521 from rus
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/rust-mode a8f94697ac 4/4: Merge pull request #521 from rust-lang/treesit-old-emacs |
Date: |
Wed, 28 Feb 2024 01:00:39 -0500 (EST) |
branch: elpa/rust-mode
commit a8f94697acbd9d71ec94b79a30685899e9c31c6a
Merge: 73e6e4ef89 b288e2d97e
Author: Sibi Prabakaran <sibi@psibi.in>
Commit: GitHub <noreply@github.com>
Merge pull request #521 from rust-lang/treesit-old-emacs
Fix tree-sitter integration for older emacs
---
Changelog.md | 1 +
rust-mode-treesitter.el | 18 +++++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index a506866e3a..cab2398bd7 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 3c3bd57284..dbad06a53e 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