Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

(electric-indent-actions): Fix corner case and refine setup

Browse source 
* lisp/electric.el (electric-indent--activate-indent-actions):
Rename from `electric-indent-toggle-indent-actions`.  Adjust callers.
Make its result less dependent on the input state.  Support `yank` and
`before-save` at the same time.
(electric-indent-actions): Use it instead if `electric-indent-mode`.
This commit is contained in:
Stefan Monnier 2025-09-23 16:38:49 -04:00
parent 34bcac0d62
commit d0b81f5d80
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/electric.el
View file

@ -208,8 +208,7 @@ significant."
:set (lambda (var val)
(set-default var val)
(when (bound-and-true-p electric-indent-mode)
(electric-indent-mode -1)
(electric-indent-mode +1)))
(electric-indent--activate-indent-actions t)))
:safe (lambda (v)
(and (proper-list-p v)
(null (seq-filter (lambda (e) (not (symbolp e)) ) v))))
@ -273,17 +272,15 @@ mode set `electric-indent-inhibit', but this can be used as a workaround.")
(with-demoted-errors "Error reindenting: %S"
(indent-region (point-min) (point-max))))))
(defun electric-indent-toggle-indent-actions (enable)
(defun electric-indent--activate-indent-actions (enable)
"Enable the actions specified in `electric-indent-actions'."
(cond
((memq 'yank electric-indent-actions)
(if enable
(advice-add #'yank :around #'electric-indent--yank-advice)
(advice-remove #'yank #'electric-indent--yank-advice)))
((memq 'before-save electric-indent-actions)
(if enable
(add-hook 'before-save-hook #'electric-indent-save-hook)
(remove-hook 'before-save-hook #'electric-indent-save-hook)))))
(advice-remove 'yank #'electric-indent--yank-advice)
(remove-hook 'before-save-hook #'electric-indent-save-hook)
(when enable
(when (memq 'yank electric-indent-actions)
(advice-add 'yank :around #'electric-indent--yank-advice))
(when (memq 'before-save electric-indent-actions)
(add-hook 'before-save-hook #'electric-indent-save-hook))))
(defun electric-indent-post-self-insert-function ()
"Function that `electric-indent-mode' adds to `post-self-insert-hook'.
@ -401,7 +398,7 @@ use `electric-indent-local-mode'."
60))
;; Toggle the reindentation on actions
(electric-indent-toggle-indent-actions electric-indent-mode))
(electric-indent--activate-indent-actions electric-indent-mode))
;;;###autoload
(define-minor-mode electric-indent-local-mode