From b0e59ccdcc133baa111f28eec488a8a4aab05c6d Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 11 May 2021 16:59:50 -0400 Subject: [PATCH] Fix #5030: leave rustfmt to :editor format --- modules/editor/format/config.el | 1 - modules/lang/rust/config.el | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el index 0387410a3..18b23ede1 100644 --- a/modules/editor/format/config.el +++ b/modules/editor/format/config.el @@ -5,7 +5,6 @@ sql-mode ; sqlformat is currently broken tex-mode ; latexindent is broken latex-mode - rustic-mode ; handled by `rustic-rustfmt' org-msg-edit-mode) ; doesn't need a formatter "A list of major modes in which to reformat the buffer upon saving. diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el index 608b2231c..be7d08f14 100644 --- a/modules/lang/rust/config.el +++ b/modules/lang/rust/config.el @@ -20,8 +20,7 @@ (set-popup-rule! "^\\*rustic-compilation" :vslot -1) ;; Leave automatic reformatting to the :editor format module. - (set-formatter! 'rustfmt #'rustic-format-buffer :modes '(rustic-mode)) - (setq rustic-babel-format-src-block (featurep! :editor format +onsave) + (setq rustic-babel-format-src-block nil rustic-format-trigger nil) ;; HACK `rustic-flycheck' adds all these hooks in disruptive places. Instead,