rhysd / conflict-marker.vim

Weapon to fight against conflicts in Vim.
488 stars 18 forks source link

Add flag to toggle detection at runtime #18

Closed bmundt6 closed 2 years ago

bmundt6 commented 3 years ago

This makes it possible to enable or disable detection during an autocmd event, which is useful as detection can be slow on extremely large files.

bmundt6 commented 3 years ago

For clarity, this is specifically how I'm using the toggle in my .vimrc:

let g:conflict_marker_enable_detect = 0
autocmd User VimConflicted let g:conflict_marker_enable_detect = 1 | doautocmd FocusGained

Now, conflict marker detection is only used when the Vim Conflicted plugin is active.

rhysd commented 2 years ago

Thanks. I merged this branch after small follow up at d5937a7.