evil-collection-elpaca-setup: update -> merge

[This upstream commit](progfolio/elpaca@039ae35) has renamed the `-update` commands to `-merge`.
emacs-evil · Mar 5, 2024 · 0da7266 · 0da7266
1 parent 54e1eb0
commit 0da7266
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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