diff options
| author | Konstantin Kharlamov <Hi-Angel@yandex.ru> | 2021-02-16 12:49:30 +0100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-02-16 12:49:53 +0100 |
| commit | 5b10ca8f4f70cbdc51970b8b756d11f1dbf6e2f6 (patch) | |
| tree | c135f19741e7c413e8fc7e13cec4eb47f62c7757 /lisp/emacs-lisp/text-property-search.el | |
| parent | 03adc69af708e53d18f4efecbcaaee02f055ef56 (diff) | |
| download | emacs-5b10ca8f4f70cbdc51970b8b756d11f1dbf6e2f6.tar.gz emacs-5b10ca8f4f70cbdc51970b8b756d11f1dbf6e2f6.tar.bz2 emacs-5b10ca8f4f70cbdc51970b8b756d11f1dbf6e2f6.zip | |
make smerge-vc-next-conflict wrap around
* 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).
Diffstat (limited to 'lisp/emacs-lisp/text-property-search.el')
0 files changed, 0 insertions, 0 deletions