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.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.el')
| -rw-r--r-- | rust-mode.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/rust-mode.el b/rust-mode.el index a0f6542..8d38295 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -71,10 +71,6 @@ instead of `prog-mode'. This option requires emacs29+." map) "Keymap for Rust major mode.") -(if (and (version<= "29.1" emacs-version) rust-mode-treesitter-derive) - (require 'rust-mode-treesitter) - (require 'rust-prog-mode)) - ;;;###autoload (autoload 'rust-mode "rust-mode" "Major mode for Rust code." t) @@ -82,6 +78,12 @@ instead of `prog-mode'. This option requires emacs29+." (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode)) (provide 'rust-mode) + +(if (and rust-mode-treesitter-derive + (version<= "29.1" emacs-version)) + (require 'rust-mode-treesitter) + (require 'rust-prog-mode)) + (require 'rust-utils) ;;; rust-mode.el ends here |