Kenneth Benzie (Benie)
fe197a4c76
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.
16 lines
521 B
VimL
16 lines
521 B
VimL
augroup benieAugroup
|
|
" Clear all autocmd's in this group
|
|
autocmd!
|
|
|
|
" Reopening a file at last curson position
|
|
au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$")
|
|
\ | exe "normal! g'\"" | endif
|
|
|
|
" TODO: Move this to a plugin & rename to .enter .exit
|
|
au BufRead,BufNewFile .env set filetype=zsh
|
|
au BufRead,BufNewFile .out set filetype=zsh
|
|
|
|
" Highlight conflict markers in any filefile
|
|
au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
|
|
augroup END
|