procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make smerge-vc-next-conflict wrap around

Browse source 
* 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
(bug#46538).
This commit is contained in:
Konstantin Kharlamov 2021-02-16 12:49:30 +01:00 • committed by Lars Ingebrigtsen
parent 03adc69af7
commit 5b10ca8f4f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/vc/smerge-mode.el
View file

@ -1468,12 +1468,12 @@ found, uses VC to try and find the next file with conflict."
(if (and (buffer-modified-p) buffer-file-name)
(save-buffer))
(vc-find-conflicted-file)
(if (eq buffer (current-buffer))
;; Do nothing: presumably `vc-find-conflicted-file' already
;; emitted a message explaining there aren't any more conflicts.
nil
(goto-char (point-min))
(smerge-next)))))))
(when (eq buffer (current-buffer))
;; Try to find a conflict marker in current file above the point.
(let ((prev-pos (point)))
(goto-char (point-min))
(unless (ignore-errors (not (smerge-next)))
(goto-char prev-pos)))))))))
(provide 'smerge-mode)