]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8538108) | patch
smerge-vc-next-conflict: Move to conflict markers more reliably
authorKonstantin Kharlamov <Hi-Angel@yandex.ru>
Tue, 9 Mar 2021 02:47:49 +0000 (04:47 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 9 Mar 2021 02:47:49 +0000 (04:47 +0200)
commit40d8f83e53ba64355035da78967c994d09a7802d
tree626dda30bc842d15439c793f0d91a2cc717a413ctree | snapshot
parent853810813283662a71358a11c128c0a1d224197ecommit | diff
smerge-vc-next-conflict: Move to conflict markers more reliably

* lisp/vc/smerge-mode.el (smerge-vc-next-conflict): Search for a
conflict marker if call to (vc-find-conflicted-file) haven't resulted in
a jump to one.  And remove `buffer` variable that becomes unused.
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.