From 857d266e7216279b40b3df66b7f537c1e30db6e0 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 10 May 2021 04:43:35 -0400 Subject: [PATCH] Inhibit format-all in modes without a formatter Should stop format-all's error from causing trouble in modes that don't have a registered formatter, like mu4e, org-msg-edit-mode, org-journal-mode, and others. --- modules/editor/format/config.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/editor/format/config.el b/modules/editor/format/config.el index 4f3719338..0387410a3 100644 --- a/modules/editor/format/config.el +++ b/modules/editor/format/config.el @@ -39,14 +39,15 @@ select buffers.") "Enable formatting on save in certain major modes. This is controlled by `+format-on-save-enabled-modes'." - (unless (or (eq major-mode 'fundamental-mode) - (cond ((booleanp +format-on-save-enabled-modes) - (null +format-on-save-enabled-modes)) - ((eq (car +format-on-save-enabled-modes) 'not) - (memq major-mode (cdr +format-on-save-enabled-modes))) - ((not (memq major-mode +format-on-save-enabled-modes)))) - (not (require 'format-all nil t))) - (+format-enable-on-save-h))) + (or (eq major-mode 'fundamental-mode) + (cond ((booleanp +format-on-save-enabled-modes) + (null +format-on-save-enabled-modes)) + ((eq (car +format-on-save-enabled-modes) 'not) + (memq major-mode (cdr +format-on-save-enabled-modes))) + ((not (memq major-mode +format-on-save-enabled-modes)))) + (not (require 'format-all nil t)) + (null (car (format-all--probe))) + (+format-enable-on-save-h))) (when (featurep! +onsave) (add-hook 'after-change-major-mode-hook #'+format-enable-on-save-maybe-h))