mirrors/doomemacs
1
Fork 0
mirror of https://github.com/doomemacs/doomemacs.git synced 2026-01-21 03:50:38 -08:00
Code Issues Projects Releases Wiki Activity
doomemacs/modules/emacs
History
Michael Peyton Jones bab4c921c8
tweak(vc): smerge-next -> smerge-vc-next-conflict 
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
2023-03-22 18:22:47 -04:00
..
dired bump: :editor dirvish 2023-02-18 01:18:36 -05:00
electric docs: change link format 2022-10-05 01:01:19 +02:00
ibuffer bump: :emacs 2023-02-20 19:00:44 -05:00
undo docs(undo): add vundo 2023-03-22 01:23:58 -04:00
vc tweak(vc): smerge-next -> smerge-vc-next-conflict 2023-03-22 18:22:47 -04:00
README.org revert: fix(docs): set mode in file-local vars 2022-08-07 19:08:07 +02:00

README.org

:emacs

Description

Modules in this category augment and extend the built-in features of Emacs.

Frequently asked questions

This category has no FAQs yet. Ask one?