aboutsummaryrefslogtreecommitdiff
path: root/evil-commands.el
diff options
context:
space:
mode:
authorTom Dalziel <tom_dl@hotmail.com>2024-03-31 00:34:10 +0100
committerTom Dalziel <33435574+tomdl89@users.noreply.github.com>2024-03-31 00:39:27 +0100
commit476f5fbcf1288c5a46a6ba35efe0b8dd1e4dd0ec (patch)
treedc22ca50018afb5abb3784b1cdfe2252b6ab50ab /evil-commands.el
parent643e01d1a07fc472b5a9ff6fa3ec001ddc8681ba (diff)
Visual X, deletion column respects stick eol
Diffstat (limited to 'evil-commands.el')
-rw-r--r--evil-commands.el13
1 files changed, 11 insertions, 2 deletions
diff --git a/evil-commands.el b/evil-commands.el
index 2ae01d5..9494030 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -1510,7 +1510,10 @@ Save in REGISTER or in the kill-ring with YANK-HANDLER."
;; Special exceptions to ever saving column:
(not (memq evil-this-motion '(evil-forward-word-begin
evil-forward-WORD-begin))))
- (move-to-column evil-operator-start-col))))
+ (move-to-column (if (and (eq most-positive-fixnum temporary-goal-column)
+ (memq last-command '(next-line previous-line)))
+ temporary-goal-column
+ evil-operator-start-col)))))
(evil-define-operator evil-delete-line (beg end type register yank-handler)
"Delete to end of line."
@@ -1526,7 +1529,13 @@ Save in REGISTER or in the kill-ring with YANK-HANDLER."
(let ((temporary-goal-column most-positive-fixnum)
(last-command 'next-line))
(evil-delete beg end 'block register yank-handler))
- (evil-delete beg end type register yank-handler))))
+ (evil-delete beg end type register yank-handler)
+ (evil-first-non-blank)
+ (when (and (not evil-start-of-line) evil-operator-start-col)
+ (move-to-column (if (and (eq most-positive-fixnum temporary-goal-column)
+ (memq last-command '(next-line previous-line)))
+ temporary-goal-column
+ evil-operator-start-col))))))
(evil-define-operator evil-delete-whole-line
(beg end type register yank-handler)