From baae6b17116f34115dd0d70be4dffda7d9ca907c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 21 Dec 2019 03:59:46 -0500 Subject: [PATCH] Rename +evil/paste-preserve-register => +evil/alt-paste Now does the invers of evil-kill-on-visual-paste --- modules/editor/evil/autoload/evil.el | 9 +++++---- modules/editor/evil/config.el | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/editor/evil/autoload/evil.el b/modules/editor/evil/autoload/evil.el index 2575b4e05..2393d5d93 100644 --- a/modules/editor/evil/autoload/evil.el +++ b/modules/editor/evil/autoload/evil.el @@ -31,11 +31,12 @@ (evil-visual-restore)) ;;;###autoload -(defun +evil/paste-preserve-register () - "Call `evil-paste-after' without overwriting the clipboard (by writing to the -0 register instead). This allows you to paste the same text again afterwards." +(defun +evil/alt-paste () + "Call `evil-paste-after' but invert `evil-kill-on-visual-paste'. +By default, this replaces the selection with what's in the clipboard without +replacing its contents." (interactive) - (let ((evil-this-register ?0)) + (let ((evil-kill-on-visual-paste (not evil-kill-on-visual-paste))) (call-interactively #'evil-paste-after))) (defun +evil--window-swap (direction) diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el index 065dbd66d..16da1b377 100644 --- a/modules/editor/evil/config.el +++ b/modules/editor/evil/config.el @@ -475,7 +475,7 @@ To change these keys see `+evil-repeat-keys'." :n "[o" #'+evil/insert-newline-above :n "]o" #'+evil/insert-newline-below :n "gp" #'+evil/reselect-paste - :v "gp" #'+evil/paste-preserve-register + :v "gp" #'+evil/alt-paste :nv "g@" #'+evil:apply-macro :nv "gc" #'evilnc-comment-operator :nv "gx" #'evil-exchange