diff options
| author | Tom Dalziel <tom_dl@hotmail.com> | 2024-06-16 18:09:50 +0200 |
|---|---|---|
| committer | Tom Dalziel <33435574+tomdl89@users.noreply.github.com> | 2024-06-16 18:45:31 +0200 |
| commit | 7bfdb135882495ab7528b87c121ddafc3640d60e (patch) | |
| tree | e4b3b3c8ceef77063c4ae9f9cd40866e605b5b47 /evil-states.el | |
| parent | e72562f0fa0256eb0868eaba271db31d602b91ee (diff) | |
Pause hooks and undos during blockwise (bulk) insert
Diffstat (limited to 'evil-states.el')
| -rw-r--r-- | evil-states.el | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/evil-states.el b/evil-states.el index 26eb844..6f3a2c0 100644 --- a/evil-states.el +++ b/evil-states.el @@ -138,6 +138,10 @@ commands opening a new line." (remove-hook 'pre-command-hook #'evil-insert-repeat-hook)) (put 'evil-insert-repeat-hook 'permanent-local-hook t) +(eval-when-compile + ;; TODO remove this once support for emacs 26 is dropped + (unless (fboundp 'combine-change-calls) + (defmacro combine-change-calls (_beg _end &rest body) `(progn ,@body)))) (declare-function evil-execute-repeat-info "evil-repeat") (defun evil-cleanup-insert-state () "Called when Insert or Replace state is about to be exited. @@ -158,19 +162,25 @@ Handles the repeat-count of the insertion command." buffer-invisibility-spec))) (cl-destructuring-bind (line col vcount) evil-insert-vcount (save-excursion - (dotimes (v (1- vcount)) - (goto-char (point-min)) - (forward-line (+ line v)) - (when (or (not evil-insert-skip-empty-lines) - (not (integerp col)) - (save-excursion - (evil-move-end-of-line) - (>= (current-column) col))) - (if (integerp col) - (move-to-column col t) - (funcall col)) - (dotimes (_ (or evil-insert-count 1)) - (evil-execute-repeat-info (cdr evil-insert-repeat-info)))))))))) + (combine-change-calls ; For performance + (progn (goto-line line) (line-beginning-position)) + (line-end-position vcount) + (let (pre-command-hook post-command-hook) ; For performance + (dotimes (v (1- vcount)) + (goto-char (point-min)) + (forward-line (+ line v)) + (when (or (not evil-insert-skip-empty-lines) + (not (integerp col)) + (save-excursion + (evil-move-end-of-line) + (>= (current-column) col))) + (if (integerp col) + (move-to-column col t) + (funcall col)) + (dotimes (_ (or evil-insert-count 1)) + (evil-execute-repeat-info (cdr evil-insert-repeat-info)))))) + (run-hooks 'post-command-hook)))))) + (and evil-want-fine-undo (evil-end-undo-step))) ;;; Visual state |