7 Commits

Author SHA1 Message Date
4ae5b87f70 Don't match non conflict markers 2018-08-25 22:20:10 +01:00
e91c279c87 Add conflict marker highlights as TODO's
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.
2018-08-25 22:20:09 +01:00
9546318f67 Remove relativenumber autocmds
These kept disabling relativenumber when editing which was annoying.
2018-08-25 22:20:09 +01:00
5a151e95d8 Add .env/.out filetype autocmds 2018-08-25 22:20:04 +01:00
49635e563a Change relativenumber behaviour 2018-08-25 22:19:58 +01:00
bf5f0c2ede Only flip relativenumber for cpp files 2018-08-25 22:19:57 +01:00
d4753aff32 Restructure vim config 2018-08-25 22:19:41 +01:00