Fix smerge (#818)

emacs-evil · Nov 23, 2024 · 20ee5f1 · 20ee5f1
1 parent 8149fd1
commit 20ee5f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/evil-collection.el b/evil-collection.el
@@ -308,6 +308,7 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'."
     simple-mpc
     slime
     sly
+    smerge-mode
     snake
     so-long
     speedbar

diff --git a/modes/smerge-mode/evil-collection-smerge-mode.el b/modes/smerge-mode/evil-collection-smerge-mode.el
@@ -34,18 +34,21 @@
 ;;;###autoload
 (defun evil-collection-smerge-mode-setup ()
   "Setup up `evil' bindings for `smerge-mode'."
+  (add-hook 'smerge-mode-hook #'evil-normalize-keymaps)
   (evil-collection-define-key 'normal 'smerge-mode-map
     "gj" 'smerge-next
     "]]" 'smerge-next
     "gk" 'smerge-prev
     "[[" 'smerge-prev
+    "gr" 'smerge-resolve
     "ga" 'smerge-keep-all
     "gu" 'smerge-keep-upper
     "gl" 'smerge-keep-lower
     "go" 'smerge-keep-other
     "gm" 'smerge-keep-mine
     "gc" 'smerge-combine-with-next
-    "gr" 'smerge-refine
+    "gR" 'smerge-refine
     "gb" 'smerge-keep-base))
+
 (provide 'evil-collection-smerge-mode)
 ;;; evil-collection-smerge-mode.el ends here
-Original file line number
+Diff line change
@@ Expand Up @@
         simple-mpc
         slime
         sly
+        smerge-mode
         snake
         so-long
         speedbar
@@ Expand Down @@