Compare commits

..

3 commits

6 changed files with 11 additions and 13 deletions

@ -1 +1 @@
Subproject commit 5e8904cd3da4565130c09b77179ae7dddd07358f Subproject commit 4d132b3ffa5c42c882fccdf970ddb3f0063ee599

@ -1 +1 @@
Subproject commit 011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc Subproject commit 41beedabc7e948c787ea5696e04c3544c3674e23

@ -1 +1 @@
Subproject commit a07a3e86ea173dd71525ee8a6fb0fcc58122cd87 Subproject commit f363d911ed2c865b8883a42613ca529cf7a6d006

View file

@ -80,12 +80,12 @@ endfun
call s:C("PmenuSel",g:cBlue,g:cLightBg,"bold") call s:C("PmenuSel",g:cBlue,g:cLightBg,"bold")
"search "search
call s:C("Search","",g:cDarkBg,"standout") call s:C("Search",g:cRed,g:cWhite,"bold")
hi! link IncSearch Search
hi! link IncSearchMatch Search hi! link IncSearchMatch Search
hi! link IncSearchMatchReverse Search hi! link IncSearchMatchReverse Search
call s:C("IncSearch","",g:cDarkBg,"standout")
hi! link IncSearchOnCursor IncSearch hi! link IncSearchOnCursor IncSearch
hi! link IncSearchCursor IncSearchOnCursor hi! link IncSearchCursor IncSearch
"status line "status line
call s:C("StatusLine","",g:cLightBg,"") call s:C("StatusLine","",g:cLightBg,"")

View file

@ -35,10 +35,7 @@ autocmd FileChangedRO * nested set noreadonly
"enable more accurate syntax synchronization "enable more accurate syntax synchronization
autocmd BufEnter * :syntax sync fromstart autocmd BufEnter * :syntax sync fromstart
"don't conceal json syntax "set filetypes for various file extensions
let g:vim_json_syntax_conceal = 0
"set given filenames to various filetypes
autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setlocal ft=aspnet autocmd BufNewFile,BufRead *.aspx,*.asmx,*.ascx,*.master setlocal ft=aspnet
autocmd BufNewFile,BufRead *.gradle setlocal ft=groovy autocmd BufNewFile,BufRead *.gradle setlocal ft=groovy
autocmd BufNewFile,BufRead *eslintrc setlocal ft=json autocmd BufNewFile,BufRead *eslintrc setlocal ft=json
@ -49,7 +46,7 @@ autocmd FileChangedRO * nested set noreadonly
"filtype specific settings "filtype specific settings
autocmd BufEnter,FileType sh setlocal iskeyword-=. autocmd BufEnter,FileType sh setlocal iskeyword-=.
autocmd Filetype text,markdown,gitcommit,mail setlocal nonumber spell nolist linebreak tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing autocmd Filetype text,markdown,gitcommit,mail setlocal nonumber spell nolist linebreak textwidth=80 tabstop=2 shiftwidth=2 breakat&vim breakat-=* breakat-=. breakat-=/ breakat-=? breakat-=, breakat-=: breakat-=; breakat-=! "set some defaults for word processing
autocmd Filetype text,gitcommit,mail setlocal wrap autocmd Filetype text,gitcommit,mail setlocal wrap
autocmd FileType tmux setlocal commentstring=#\ %s "set the comment string to # autocmd FileType tmux setlocal commentstring=#\ %s "set the comment string to #
autocmd FileType scss setlocal iskeyword+=$ autocmd FileType scss setlocal iskeyword+=$
@ -65,9 +62,8 @@ autocmd FileChangedRO * nested set noreadonly
"settings for buffers in diff mode "settings for buffers in diff mode
autocmd VimEnter,FilterWritePre * if &diff|setlocal nofoldenable|endif autocmd VimEnter,FilterWritePre * if &diff|setlocal nofoldenable|endif
autocmd VimEnter * if &diff|wincmd H|endif
"disable the whitespace plugin for vimfiler "disable the whitespace plugin for vimfiler and the mail filetype
autocmd BufEnter,FileType vimfiler,mail hi ExtraWhitespace ctermbg=NONE guibg=NONE autocmd BufEnter,FileType vimfiler,mail hi ExtraWhitespace ctermbg=NONE guibg=NONE
"vimpager settings "vimpager settings

View file

@ -0,0 +1,2 @@
"don't conceal json syntax
let g:vim_json_syntax_conceal = 0