File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -889,6 +889,14 @@ current line.")
889
889
(goto-char (point-max ))
890
890
(smerge-prev ))
891
891
892
+ (defun +smerge-vc-next-conflict-recenter ()
893
+ " Go to next conflict, possibly in another file."
894
+ (interactive )
895
+ (smerge-vc-next-conflict)
896
+ ; ; Often, after calling `smerge-vc-next-conflict' , the cursor will land at
897
+ ; ; the bottom of the window.
898
+ (recenter-top-bottom (/ (window-height ) 8 )))
899
+
892
900
(with-eval-after-load 'hydra
893
901
(defhydra +smerge-hydra (:hint nil
894
902
:pre (if (not smerge-mode) (smerge-mode 1 ))
@@ -927,9 +935,7 @@ current line.")
927
935
(" C" smerge-combine-with-next)
928
936
(" r" smerge-resolve)
929
937
(" R" smerge-kill-current)
930
- ; ; Often after calling `smerge-vc-next-conflict' , the cursor will land at
931
- ; ; the bottom of the window
932
- (" n" (progn (smerge-vc-next-conflict) (recenter-top-bottom (/ (window-height ) 8 ))))
938
+ (" n" +smerge-vc-next-conflict-recenter)
933
939
(" q" nil :color blue))))
934
940
935
941
(use-package octave
You can’t perform that action at this time.
0 commit comments