diff options
Diffstat (limited to 'vim')
| -rwxr-xr-x | vim/.vim/gvimrc | 2 | ||||
| -rwxr-xr-x | vim/.vim/vimrc | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/vim/.vim/gvimrc b/vim/.vim/gvimrc index 50c7b2d..16e63eb 100755 --- a/vim/.vim/gvimrc +++ b/vim/.vim/gvimrc @@ -1,5 +1,5 @@ runtime ftplugin/man.vim nmap K :Man <cword><CR> set guifont=Latin\ Modern\ Mono\ 12 -set guioptions=ci +set guioptions=cdi set guicursor+=a:blinkon0 diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index 5f5751b..56a99fe 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -19,14 +19,15 @@ autocmd! autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal autocmd BufNewFile,BufRead *.m setlocal filetype=octave autocmd FileType asm,c,h,go,glsl -\ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 -autocmd FileType vim,sh,lua,tex,cpp,html,octave,pascal setlocal shiftwidth=2 + \ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8 +autocmd FileType vim,sh,lua,tex,cmake,cpp,html,octave,pascal + \ setlocal shiftwidth=2 autocmd FileType rst setlocal shiftwidth=3 autocmd FileType java setlocal omnifunc=javacomplete#Complete autocmd FileType python,cython -\ let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) + \ let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) autocmd BufWinEnter * if !exists('w:m1') | -\ let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) | endif + \ let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) | endif let g:srcery_italic=1 let g:jedi#popup_on_dot = 0 |