Skip to content

Unset insert-exit-key when it isn't needed anymore #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ventruvian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unset insert-exit-key when it isn't needed anymore #774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 27 additions & 25 deletions meow-beacon.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,31 +96,33 @@ Non-nil BACKWARD means backward direction."

(defun meow--beacon-apply-command (cmd)
"Apply CMD in BEACON state."
(when meow--beacon-overlays
(let ((bak (overlay-get (car meow--beacon-overlays)
'meow-beacon-backward)))
(meow--wrap-collapse-undo
(save-mark-and-excursion
(cl-loop for ov in (if bak (reverse meow--beacon-overlays) meow--beacon-overlays) do
(when (and (overlayp ov))
(let ((type (overlay-get ov 'meow-beacon-type))
(backward (overlay-get ov 'meow-beacon-backward)))
;; always switch to normal state before applying kmacro
(meow--switch-state 'normal)

(if (eq type 'cursor)
(progn
(meow--cancel-selection)
(goto-char (overlay-start ov)))
(thread-first
(if backward
(meow--make-selection
type (overlay-end ov) (overlay-start ov))
(meow--make-selection type (overlay-start ov) (overlay-end ov)))
(meow--select t)))

(call-interactively cmd))
(delete-overlay ov))))))))
(unwind-protect
(when meow--beacon-overlays
(let ((bak (overlay-get (car meow--beacon-overlays)
'meow-beacon-backward)))
(meow--wrap-collapse-undo
(save-mark-and-excursion
(cl-loop for ov in (if bak (reverse meow--beacon-overlays) meow--beacon-overlays) do
(when (and (overlayp ov))
(let ((type (overlay-get ov 'meow-beacon-type))
(backward (overlay-get ov 'meow-beacon-backward)))
;; always switch to normal state before applying kmacro
(meow--switch-state 'normal)

(if (eq type 'cursor)
(progn
(meow--cancel-selection)
(goto-char (overlay-start ov)))
(thread-first
(if backward
(meow--make-selection
type (overlay-end ov) (overlay-start ov))
(meow--make-selection type (overlay-start ov) (overlay-end ov)))
(meow--select t)))

(call-interactively cmd))
(delete-overlay ov)))))))
(setq-local meow--beacon-insert-enter-key nil)))

(defun meow--beacon-apply-kmacros-from-insert ()
"Apply kmacros in BEACON state, after exiting from insert.
Expand Down
Loading