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

tweak(vc): smerge-next -> smerge-vc-next-conflict

Browse source 
This is provided by `smerge-mode` in Emacs 27, and functions exactly
like `smerge-next`, except that if there are no more conflicts in the
current file, it will go to the next file with conflicts.

Arguably this could be a different key binding. However, I find that it
is almost strictly superior to `smerge-next`: I can't think of a case
where I *wouldn't* immediately want to go to the next file with
conflicts, and even if you do by accident you can just pop back to the
preceding buffer. So I think it warrants being the default.

Close: #5431
This commit is contained in:
Michael Peyton Jones 2023-03-22 18:20:50 -04:00 • committed by Henrik Lissner
parent 09f602b342
commit bab4c921c8
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
" "
("g" (progn (goto-char (point-min)) (smerge-next))) ("g" (progn (goto-char (point-min)) (smerge-next)))
("G" (progn (goto-char (point-max)) (smerge-prev))) ("G" (progn (goto-char (point-max)) (smerge-prev)))
("C-j" smerge-next) ("C-j" smerge-vc-next-conflict)
("C-k" smerge-prev) ("C-k" smerge-prev)
("j" next-line) ("j" next-line)
("k" previous-line) ("k" previous-line)