[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#46538: [PATCH] vc: make smerge-vc-next-conflict wrap around
|
From: |
Lars Ingebrigtsen |
|
Subject: |
bug#46538: [PATCH] vc: make smerge-vc-next-conflict wrap around |
|
Date: |
Tue, 16 Feb 2021 12:50:18 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) |
Konstantin Kharlamov <Hi-Angel@yandex.ru> writes:
> * lisp/vc/smerge-mode.el:
> (smerge-vc-next-conflict): While searching for conflict markers, wrap
> search around if current file is the last one with conflicts.
Looks good to me, so I've applied your patch to Emacs 28.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no