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.

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

Setting registers is more in line with VIM #1049

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Setting registers is more in line with VIM #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cccb39e
Make setting registers more in line with VIM
nnicandro Jan 27, 2023
c024c15
Revive `evil-was-yanked-without-register`
nnicandro Dec 20, 2019
c2e1866
Set the yank register when the unnamed register is set
nnicandro May 10, 2024
b05ea8b
Fix a test in `evil-test-register`
nnicandro May 2, 2024
a82a352
Add registers tag to tests using registers
nnicandro May 9, 2024
ad7bd8f
Remove setting of small delete register in `evil-delete`
nnicandro May 10, 2024
45f3ffe
Fix `evil-test-visual-paste` tests
nnicandro May 15, 2024
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
48 changes: 26 additions & 22 deletions evil-commands.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,24 +1406,26 @@ the left edge."
;;; Operator commands

(evil-define-operator evil-yank (beg end type register yank-handler)
"Save the characters in motion into the kill-ring."
"Save the characters in motion into the `kill-ring'.
Save in REGISTER or in the yank register, \"0, with YANK-HANDLER.
Also save in the `kill-ring'.

See `evil-kill-new' for more details on how text is saved."
:move-point nil
:repeat nil
(interactive "<R><x><y>")
(let ((evil-was-yanked-without-register
(and evil-was-yanked-without-register (not register))))
(cond
((and (fboundp 'cua--global-mark-active)
(fboundp 'cua-copy-region-to-global-mark)
(cua--global-mark-active))
(cua-copy-region-to-global-mark beg end))
((eq type 'block)
(evil-yank-rectangle beg end register yank-handler))
((memq type '(line screen-line))
(evil-yank-lines beg end register yank-handler))
(t
(evil-yank-characters beg end register yank-handler)
(goto-char beg)))))
(cond
((and (fboundp 'cua--global-mark-active)
(fboundp 'cua-copy-region-to-global-mark)
(cua--global-mark-active))
(cua-copy-region-to-global-mark beg end))
((eq type 'block)
(evil-yank-rectangle beg end register yank-handler))
((memq type '(line screen-line))
(evil-yank-lines beg end register yank-handler))
(t
(evil-yank-characters beg end register yank-handler)
(goto-char beg))))

(defun evil-expand-line-for-line-based-operators (beg end type)
"Expand to line when in visual mode possibly changing BEG, END and TYPE.
Expand Down Expand Up @@ -1459,7 +1461,14 @@ Avoids double expansion for line based commands like 'V' or 'D'."

(evil-define-operator evil-delete (beg end type register yank-handler)
"Delete text from BEG to END with TYPE.
Save in REGISTER or in the kill-ring with YANK-HANDLER."
Save in REGISTER or in one of the delete registers with
YANK-HANDLER. Also save in the `kill-ring'.

Saved in the first delete register, \"1, if the deleted text
spans multiple lines or in the small delete register, \"-, if the
deleted text is within a line.

See `evil-kill-new' for more details on how text is saved."
(interactive "<R><x><y>")
(when (and (memq type '(inclusive exclusive))
(not (evil-visual-state-p))
Expand All @@ -1473,12 +1482,7 @@ Save in REGISTER or in the kill-ring with YANK-HANDLER."
(setq beg (car new-range)
end (cadr new-range)
type 'line)))
(unless register
(let ((text (filter-buffer-substring beg end)))
(unless (string-match-p "\n" text)
;; set the small delete register
(evil-set-register ?- text))))
(let ((evil-was-yanked-without-register nil))
(let ((this-command 'evil-delete))
(evil-yank beg end type register yank-handler))
(cond
((eq type 'block)
Expand Down
111 changes: 73 additions & 38 deletions evil-common.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,9 @@ The following special registers are supported.
((eq register ?\")
(current-kill 0))
((<= ?1 register ?9)
(let ((reg (- register ?1)))
(let ((kill-ring evil-delete-kill-ring)
(kill-ring-yank-pointer evil-delete-kill-ring)
(reg (- register ?1)))
(and (< reg (length kill-ring))
(current-kill reg t))))
((memq register '(?* ?+))
Expand Down Expand Up @@ -2089,13 +2091,13 @@ register instead of replacing its content."
(user-error "Can't modify read-only register"))
((eq register ?\") (kill-new text))
((<= ?1 register ?9)
(if (null kill-ring)
(kill-new text)
(let ((kill-ring-yank-pointer kill-ring-yank-pointer)
interprogram-paste-function
interprogram-cut-function)
(current-kill (- register ?1))
(setcar kill-ring-yank-pointer text))))
(let ((kill-ring evil-delete-kill-ring)
(kill-ring-yank-pointer evil-delete-kill-ring)
interprogram-paste-function
interprogram-cut-function)
(current-kill (- register ?1))
(setcar kill-ring-yank-pointer text)
(setq evil-delete-kill-ring kill-ring)))
((eq register ?*) (evil-set-selection 'PRIMARY text))
((eq register ?+) (evil-set-selection 'CLIPBOARD text))
((eq register ?-) (setq evil-last-small-deletion text))
Expand Down Expand Up @@ -2346,20 +2348,63 @@ The tracked insertion is set to `evil-last-insertion'."

;;; Paste

(defun evil-kill-new (text &optional register)
"Like `kill-new', but also handle `evil' registers.
When REGISTER is the black hole register, \"_, do nothing and
return.

Otherwise store TEXT in the `kill-ring'. If REGISTER is
specified, store TEXT in that register. If REGISTER is not
specified and `this-command' is a yank command (i.e. not
`evil-delete'), store TEXT in the yank register, \"0. Also store
in the yank register if REGISTER is the unnamed register, \"\".

If `this-command' is `evil-delete', TEXT is considered deleted
TEXT and will be stored in the first delete register, \"1, when
TEXT spans multiple lines or the small delete register, \"-, when
TEXT is within a line. This is only done if REGISTER is not
provided.

As a special case, if the motion used to delete TEXT is one of
`evil-special-delete-motions', store TEXT in the first delete
register even when REGISTER is provided."
(prog1 text
(unless (eq register ?_)
(kill-new text)
(when register
(evil-set-register register text))
(when (or (and (null register)
(not (eq this-command 'evil-delete)))
;; As per Vim documentation, set the yank register
;; when the unnamed register is specified.
(eq register ?\"))
;; set the yank register
(evil-set-register ?0 text))
(when (eq this-command 'evil-delete)
(let ((special-motion (memq evil-this-motion
evil-special-delete-motions))
(within-line (not (string-match-p "\n" text))))
(when (and within-line (not register))
;; set the small delete register
(evil-set-register ?- text))
(when (or special-motion
(and (not register) (not within-line)))
;; set the delete register
(let ((kill-ring evil-delete-kill-ring)
(kill-ring-yank-pointer)
(kill-ring-max 9))
(kill-new text)
(setq evil-delete-kill-ring kill-ring))))))))

(defun evil-yank-characters (beg end &optional register yank-handler)
"Save the characters defined by the region BEG and END in the kill-ring."
"Save the characters defined by the region BEG and END in the `kill-ring'."
(let ((text (filter-buffer-substring beg end)))
(when yank-handler
(put-text-property 0 (length text) 'yank-handler (list yank-handler) text))
(when register
(evil-set-register register text))
(when evil-was-yanked-without-register
(evil-set-register ?0 text)) ; "0 register contains last yanked text
(unless (eq register ?_)
(kill-new text))))
(setq text (propertize text 'yank-handler (list yank-handler))))
(evil-kill-new text register)))

(defun evil-yank-lines (beg end &optional register yank-handler)
"Save the lines in the region BEG and END into the kill-ring."
"Save the lines in the region BEG and END into the `kill-ring'."
(let ((text (filter-buffer-substring beg end))
(yank-handler (list (or yank-handler #'evil-yank-line-handler)
nil
Expand All @@ -2369,16 +2414,11 @@ The tracked insertion is set to `evil-last-insertion'."
(when (or (zerop (length text))
(/= (aref text (1- (length text))) ?\n))
(setq text (concat text "\n")))
(put-text-property 0 (length text) 'yank-handler yank-handler text)
(when register
(evil-set-register register text))
(when evil-was-yanked-without-register
(evil-set-register ?0 text)) ; "0 register contains last yanked text
(unless (eq register ?_)
(kill-new text))))
(setq text (propertize text 'yank-handler yank-handler))
(evil-kill-new text register)))

(defun evil-yank-rectangle (beg end &optional register yank-handler)
"Save the rectangle defined by region BEG and END into the kill-ring."
"Save the rectangle defined by region BEG and END into the `kill-ring'."
(let ((lines (list nil)))
(evil-apply-on-rectangle #'extract-rectangle-line beg end lines)
;; We remove spaces from the beginning and the end of the next.
Expand All @@ -2387,19 +2427,14 @@ The tracked insertion is set to `evil-last-insertion'."
(setq lines (nreverse (cdr lines)))
;; `text' is used as default insert text when pasting this rectangle
;; in another program, e.g., using the X clipboard.
(let ((yank-handler (list (or yank-handler #'evil-yank-block-handler)
lines
t
#'evil-delete-yanked-rectangle))
(text (mapconcat #'identity lines "\n")))
(put-text-property 0 (length text) 'yank-handler yank-handler text)
(when register
(evil-set-register register text))
(when evil-was-yanked-without-register
(evil-set-register ?0 text)) ; "0 register contains last yanked text
(unless (eq register ?_)
(kill-new text))
text)))
(let* ((yank-handler (list (or yank-handler
#'evil-yank-block-handler)
lines
t
'evil-delete-yanked-rectangle))
(text (propertize (mapconcat #'identity lines "\n")
'yank-handler yank-handler)))
(evil-kill-new text register))))

(defun evil-remove-yank-excluded-properties (text)
"Remove `yank-excluded-properties' from TEXT."
Expand Down
Loading