X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=e552eff7ff6769794875699c15e8e438a86ad925;hp=05a7966e846bbeb8ac5319cc5b9c8cc323bf8580;hb=e7fb4ebb2b445f37f03b9983d737b7345533863f;hpb=2659c7722f80d1954ac1c8c73b223f0cf986c088

diff --git a/init.vim b/init.vim
index 05a7966..e552eff 100644
--- a/init.vim
+++ b/init.vim
@@ -40,17 +40,20 @@ end
 syntax on
 
 
-" Trailing whitespace
-highlight default link TrailingWhitespace SpellCap
-" Make trailing whitespace be flagged as bad.
-au BufRead,BufNewFile * syn match TrailingWhitespace /\s\+$/ containedin=ALL
-
-
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some global plugin settings
 
 runtime plugsetup.vim
 
+" Attention: Must be run after plugsetup.vim
+" Trailing whitespace
+highlight default link BadWhitespace SpellCap
+" Make trailing whitespace be flagged as bad.
+au BufRead,BufNewFile * syn match BadWhitespace /\s\+$/ containedin=ALL
+" Make space before tab be flagged as bad and vice versa
+au BufRead,BufNewFile * syn match BadWhitespace / \+\t/ containedin=ALL
+au BufRead,BufNewFile * syn match BadWhitespace /\t \+/ containedin=ALL
+
 let g:airline_powerline_fonts=1
 let g:airline#extensions#tabline#enabled=1
 let g:airline#extensions#branch#enabled=1
@@ -110,7 +113,8 @@ au BufRead,BufNewFile *.cls set filetype=tex
 au FileType text,markdown,mail,tex,gitcommit,mediawiki,vimwiki setlocal spell
 au FileType text,markdown,mail,gitcommit,mediawiki,vimwiki set fo+=n
 
-au Filetype tex set shiftwidth=2
+au Filetype go set shiftwidth=8 tabstop=8 noexpandtab
+au Filetype tex set shiftwidth=2 tabstop=2
 
 au FileType mediawiki setlocal wrap linebreak tw=0
 
@@ -118,6 +122,9 @@ au FileType mediawiki setlocal wrap linebreak tw=0
 au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/
 au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
 
+" Line wrap crippled with numbers shown
+au Filetype man set nonumber
+
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings