diff options
| -rw-r--r-- | rust-mode-treesitter.el | 7 | ||||
| -rw-r--r-- | rust-mode.el | 10 | ||||
| -rw-r--r-- | rust-prog-mode.el | 3 |
3 files changed, 12 insertions, 8 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. 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 diff --git a/rust-prog-mode.el b/rust-prog-mode.el index 51e802d..05bc5e0 100644 --- a/rust-prog-mode.el +++ b/rust-prog-mode.el @@ -4,7 +4,8 @@ ;; rust-mode code deriving from prog-mode instead of rust-ts-mode ;;; Code: -(require 'rust-common) + +(require 'rust-mode) (defvar electric-pair-inhibit-predicate) (defvar electric-pair-skip-self) |