procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; (completion-preview-partial-insert): Avoid no-op undo entries

Browse source 
* lisp/completion-preview.el
(completion-preview-partial-insert): Abort change group
rather than deleting entire temporary insertion, so as to
avoid recording no-op undo entries.  Move 'deactivate-mark'
let-binding outside of 'catch' form.
This commit is contained in:
Eshel Yaron 2024-06-28 12:57:32 +02:00
parent 48f9dde133
commit 5e3b94e1be
No known key found for this signature in database
GPG key ID: EF3EE9CA35D78618
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
lisp/completion-preview.el
View file

@ -506,23 +506,27 @@ Beyond moving point, FUN should not modify the current buffer."
(let* ((end (completion-preview--get 'completion-preview-end))
(aft (completion-preview--get 'after-string))
(eoc (+ end (length aft))))
;; Partially insert current completion candidate.
(atomic-change-group
(let ((change-group (prepare-change-group))
;; Keep region active, if it is already. This allows
;; commands such as `completion-preview-insert-word' to
;; interact correctly with `shift-select-mode'.
(deactivate-mark nil))
(save-excursion
(goto-char end)
;; Temporarily insert the full completion candidate.
(insert (substring-no-properties aft)))
;; Set point to the end of the prefix that we want to keep.
(apply fun args)
;; Delete the rest.
(delete-region (min (max end (point)) eoc) eoc)
;; Combine into one change group
(undo-amalgamate-change-group change-group)))
;; Keep region active, if it is already. This lets commands that
;; call this function interact correctly with `shift-select-mode'.
(let ((deactivate-mark nil))
;; Partially insert current completion candidate.
(catch 'abort-atomic-change
(atomic-change-group
(let ((change-group (prepare-change-group)))
(save-excursion
(goto-char end)
;; Temporarily insert the full completion candidate.
(insert (substring-no-properties aft)))
;; Set point to the end of the prefix that we want to keep.
(apply fun args)
(unless (< end (point))
;; Point didn't advance into the completion, so abort change
;; to avoid littering `buffer-undo-list' with a nop entry.
(throw 'abort-atomic-change nil))
;; Delete the rest.
(delete-region (min (point) eoc) eoc)
;; Combine into one change group.
(undo-amalgamate-change-group change-group)))))
;; Cleanup.
(cond
;; If we kept the entire completion candidate, call :exit-function.