emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(vc): add next conflict in project to +vc/smerge-hydra

Browse source 
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.
This commit is contained in:
Daanturo 2022-05-04 14:19:59 +07:00 • committed by Henrik Lissner
parent 90c510caca
commit 5974543732
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/emacs/vc/autoload/hydra.el
View file

@ -14,7 +14,7 @@
^_g_^ [_b_] base [_<_] upper/base [_C_] Combine ^_g_^ [_b_] base [_<_] upper/base [_C_] Combine
^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve ^_C-k_^ [_u_] upper [_=_] upper/lower [_r_] resolve
^_k_ ↑^ [_l_] lower [_>_] base/lower [_R_] remove ^_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 ╭────────── ^_C-j_^ [_RET_] current [_E_] ediff ╭──────────
^_G_^ │ [_q_] quit ^_G_^ │ [_q_] quit
" "
@ -38,4 +38,7 @@
("C" smerge-combine-with-next) ("C" smerge-combine-with-next)
("r" smerge-resolve) ("r" smerge-resolve)
("R" smerge-kill-current) ("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)) ("q" nil :color blue))