Skip to content
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.

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

Improve evil-change's handling of screen-lines #1775

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions evil-commands.el
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ Save in REGISTER or in the kill-ring with YANK-HANDLER."
(cond
((eq type 'block)
(evil-apply-on-block #'delete-region beg end nil))
((and (eq type 'line)
((and (memq type '(line screen-line))
(= end (point-max))
(or (= beg end)
(/= (char-before end) ?\n))
Expand Down Expand Up @@ -1696,7 +1696,9 @@ of the block."
(evil-start-undo-step))
(funcall delete-func beg end type register yank-handler)
(cond
((eq type 'line)
((or (eq type 'line)
(and (eq type 'screen-line)
(> nlines 1)))
(setq this-command 'evil-change-whole-line) ; for evil-maybe-remove-spaces
(cond
((/= opoint leftmost-point) (evil-insert 1)) ; deletion didn't delete line
Expand Down