diff options
| author | Sibi Prabakaran <sibi@psibi.in> | 2024-03-29 14:06:04 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-29 14:06:04 +0530 |
| commit | b2b18aa6c135d9b06242b3d081d94fe0c0cb8e86 (patch) | |
| tree | cd563ea9a13ee808fcd793a81ddb2f9fdc413ed8 /rust-mode-treesitter.el | |
| parent | 150b61f7ed9593c1d433794aa097f2e9ca8cdf75 (diff) | |
| parent | 7c5de035fab1b46926964b0defebef26357a5209 (diff) | |
| download | rust-mode-b2b18aa6c135d9b06242b3d081d94fe0c0cb8e86.tar.gz | |
Merge pull request #534 from tarsiiformes/fixup
Fix ancient defect and dependency complications related to having two rust-mode implementations
Diffstat (limited to 'rust-mode-treesitter.el')
| -rw-r--r-- | rust-mode-treesitter.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rust-mode-treesitter.el b/rust-mode-treesitter.el index 89c7cd4..21eab59 100644 --- a/rust-mode-treesitter.el +++ b/rust-mode-treesitter.el @@ -5,12 +5,13 @@ ;;; Code: +(require 'rust-mode) + +;; Do not compile or load on Emacs releases that don't support +;; this. See https://github.com/rust-lang/rust-mode/issues/520. (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. |