config/vim
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Add conflict marker highlights as TODO's

Browse Source 
For all filetype's highlight conflict markers with the Todo highlight
group and leave trailing text as before. This makes conflict markers
very obvious, in C/C++ where I have operator highlighting conflict
markers are not longer highlighted as operators.
This commit is contained in:
Kenneth Benzie 2018-03-29 21:22:26 +01:00
parent 5380ea7c78
commit fe197a4c76
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/autocmds.vim
View File

@ -9,4 +9,7 @@ augroup benieAugroup
" TODO: Move this to a plugin & rename to .enter .exit " TODO: Move this to a plugin & rename to .enter .exit
au BufRead,BufNewFile .env set filetype=zsh au BufRead,BufNewFile .env set filetype=zsh
au BufRead,BufNewFile .out set filetype=zsh au BufRead,BufNewFile .out set filetype=zsh
" Highlight conflict markers in any filefile
au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
augroup END augroup END