From 0da72667ced05268e959d97de5d24ce0d992af1f Mon Sep 17 00:00:00 2001 From: asymmetric Date: Tue, 5 Mar 2024 12:25:33 +0000 Subject: [PATCH] evil-collection-elpaca-setup: update -> merge [This upstream commit](https://github.com/progfolio/elpaca/commit/039ae35a573af904e425b95e1cf0401e3f43537b) has renamed the `-update` commands to `-merge`. --- modes/elpaca/evil-collection-elpaca.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modes/elpaca/evil-collection-elpaca.el b/modes/elpaca/evil-collection-elpaca.el index 25dbc2c..ce295db 100644 --- a/modes/elpaca/evil-collection-elpaca.el +++ b/modes/elpaca/evil-collection-elpaca.el @@ -105,10 +105,10 @@ If this is nil, match original `elpaca' behavior." (if evil-collection-elpaca-want-u-unmark (evil-collection-define-key 'normal 'elpaca-ui-mode-map (kbd "u") 'elpaca-ui-unmark - (kbd "U") 'elpaca-ui-mark-update) + (kbd "U") 'elpaca-ui-mark-merge) (evil-collection-define-key 'normal 'elpaca-ui-mode-map (kbd "U") 'elpaca-ui-unmark - (kbd "u") 'elpaca-ui-mark-update)) + (kbd "u") 'elpaca-ui-mark-merge)) (if evil-collection-elpaca-want-v (evil-collection-define-key 'normal 'elpaca-ui-mode-map