fix vim tabulation and highlighting

[dotfiles.git] / etc / vim / .vimrc

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index 9c1fd4c08d26bf8fb8b07ac18dd540d55bb1f079..7a142e4460333aa508bb9c66d32d9ad185b98024 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -39,11 +39,11 @@ unlet y
 set autoindent
 set colorcolumn=80
 highlight ColorColumn term=NONE ctermbg=0
 set autoindent
 set colorcolumn=80
 highlight ColorColumn term=NONE ctermbg=0

-autocmd FileType python     setlocal tabstop=4 shiftwidth=4 expandtab
-autocmd FileType markdown   setlocal tabstop=4 shiftwidth=4 expandtab
-autocmd FileType javascript setlocal tabstop=2 shiftwidth=2 expandtab
-autocmd FileType json       setlocal tabstop=2 shiftwidth=2 expandtab
-autocmd FileType html       setlocal tabstop=2 shiftwidth=2 expandtab
+autocmd FileType python     setlocal softtabstop=4 shiftwidth=4 expandtab
+autocmd FileType markdown   setlocal softtabstop=4 shiftwidth=4 expandtab
+autocmd FileType javascript setlocal softtabstop=2 shiftwidth=2 expandtab
+autocmd FileType json       setlocal softtabstop=2 shiftwidth=2 expandtab
+autocmd FileType html       setlocal softtabstop=2 shiftwidth=2 expandtab

 autocmd FileType todo       setlocal colorcolumn=0
 
 set cursorline
 autocmd FileType todo       setlocal colorcolumn=0
 
 set cursorline


@@ -58,7 +58,7 @@ autocmd FocusLost   * setlocal norelativenumber
 autocmd FocusGained * setlocal   relativenumber
 highlight WhiteSpaceBol ctermfg=DarkBlue
 highlight WhiteSpaceMol ctermfg=Black
 autocmd FocusGained * setlocal   relativenumber
 highlight WhiteSpaceBol ctermfg=DarkBlue
 highlight WhiteSpaceMol ctermfg=Black

-match WhiteSpaceMol / /
-2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
+autocmd BufEnter * 2match WhiteSpaceBol /\(^ \+\)\|\( \+$\)/
+autocmd BufEnter * match WhiteSpaceMol / /

 
 let g:EditorConfig_enable_for_new_buf = 1
 
 let g:EditorConfig_enable_for_new_buf = 1