editor/format: don't move cursor on format-on-save
Also renames +format|on-save to +format|buffer for clarity. It should not (normally) be used directly. Use `+format|enable-on-save-maybe` and `+format|enable-on-save`.
This commit is contained in:
parent
ee4d317293
commit
e932c74758
2 changed files with 10 additions and 8 deletions
|
@ -224,10 +224,11 @@ is selected)."
|
||||||
;;
|
;;
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defalias '+format|enable-on-save #'format-all-mode)
|
(defun +format|enable-on-save ()
|
||||||
|
"Enables formatting on save."
|
||||||
|
(add-hook 'before-save-hook #'+format|buffer nil t))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +format|on-save ()
|
(defun +format|buffer ()
|
||||||
"Runs `format-all-buffer' without moving the cursor."
|
"Runs `format-all-buffer' immediately, without moving the cursor."
|
||||||
(save-excursion
|
(save-excursion (format-all-buffer)))
|
||||||
(format-all-buffer)))
|
|
||||||
|
|
|
@ -16,8 +16,9 @@ If nil, it is disabled in all modes, the same as if the +onsave flag wasn't
|
||||||
;;
|
;;
|
||||||
|
|
||||||
(defun +format|enable-on-save-maybe ()
|
(defun +format|enable-on-save-maybe ()
|
||||||
"Enable `format-all-mode' in buffers. See `+format-on-save-enabled-modes' to
|
"Enable formatting on save in certain major modes.
|
||||||
control which major modes to target."
|
|
||||||
|
This is controlled by `+format-on-save-enabled-modes'."
|
||||||
(unless (or (eq major-mode 'fundamental-mode)
|
(unless (or (eq major-mode 'fundamental-mode)
|
||||||
(cond ((booleanp +format-on-save-enabled-modes)
|
(cond ((booleanp +format-on-save-enabled-modes)
|
||||||
(null +format-on-save-enabled-modes))
|
(null +format-on-save-enabled-modes))
|
||||||
|
@ -26,7 +27,7 @@ control which major modes to target."
|
||||||
((not (memq major-mode +format-on-save-enabled-modes))))
|
((not (memq major-mode +format-on-save-enabled-modes))))
|
||||||
(not (require 'format-all nil t))
|
(not (require 'format-all nil t))
|
||||||
(not (format-all-probe)))
|
(not (format-all-probe)))
|
||||||
(add-hook 'before-save-hook #'+format|on-save nil t)))
|
(add-hook 'before-save-hook #'+format|buffer nil t)))
|
||||||
|
|
||||||
(when (featurep! +onsave)
|
(when (featurep! +onsave)
|
||||||
(add-hook 'after-change-major-mode-hook #'+format|enable-on-save-maybe))
|
(add-hook 'after-change-major-mode-hook #'+format|enable-on-save-maybe))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue