From 59745437327df0f2061350c779b96271ac9bff44 Mon Sep 17 00:00:00 2001 From: Daanturo Date: Wed, 4 May 2022 14:19:59 +0700 Subject: [PATCH] feat(vc): add next conflict in project to +vc/smerge-hydra new hydra head: "n" (progn (smerge-vc-next-conflict) (recenter-top-bottom (/ (window-height) 8))) Allow us to jump to the next merge conflict in current project without leaving the hydra and/or opening magit. --- modules/emacs/vc/autoload/hydra.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/emacs/vc/autoload/hydra.el b/modules/emacs/vc/autoload/hydra.el index 7b69d4602..dc0a13408 100644 --- a/modules/emacs/vc/autoload/hydra.el +++ b/modules/emacs/vc/autoload/hydra.el @@ -14,7 +14,7 @@ ^_g_^ [_b_] base [_<_] upper/base [_C_] Combine ^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve ^_k_ ↑^ [_l_] lower [_>_] base/lower [_R_] remove - ^_j_ ↓^ [_a_] all [_H_] hightlight + ^_j_ ↓^ [_a_] all [_H_] hightlight [_n_] next in project ^_C-j_^ [_RET_] current [_E_] ediff ╭────────── ^_G_^ │ [_q_] quit " @@ -38,4 +38,7 @@ ("C" smerge-combine-with-next) ("r" smerge-resolve) ("R" smerge-kill-current) + ;; Often after calling `smerge-vc-next-conflict', the cursor will land at + ;; the bottom of the window + ("n" (progn (smerge-vc-next-conflict) (recenter-top-bottom (/ (window-height) 8)))) ("q" nil :color blue))