GNU bug report logs - #46538
Patch: wrap around smerge-vc-next-conflict if current file still has conflicts

Previous Next

Package: emacs;

Reported by: Konstantin Kharlamov <hi-angel <at> yandex.ru>

Date: Mon, 15 Feb 2021 18:53:01 UTC

Severity: normal

Tags: fixed, patch

Fixed in version 28.1

Done: Lars Ingebrigtsen <larsi <at> gnus.org>

Bug is archived. No further changes may be made.

Full log

View this message in rfc822 format

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Konstantin Kharlamov <Hi-Angel <at> yandex.ru>
Cc: contovob <at> tcd.ie, 46538 <at> debbugs.gnu.org
Subject: bug#46538: [PATCH] vc: make smerge-vc-next-conflict wrap around
Date: Tue, 16 Feb 2021 12:50:18 +0100

Konstantin Kharlamov <Hi-Angel <at> 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
This bug report was last modified 4 years and 96 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.