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

diff --git a/init.vim b/init.vim
index 05a7966..e4ed9a1 100644
--- a/init.vim
+++ b/init.vim
@@ -40,17 +40,35 @@ 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
 
+" Enable loading of devicons
+let g:enable_plugin_devicons = 1
+
 runtime plugsetup.vim
 
+" Attention: Must be run after plugsetup.vim
+" Trailing whitespace
+highlight default link BadWhitespace SpellCap
+
+" Setup BadWhitespace syntax match expressions.
+function SetBadWhitespaceSyntax()
+  " Do not expose bad whitespace in help buffers or for man pages. Or, more
+  " generally, if we open the file readonly.
+  "if &ft != "help" && &ft != "man"
+  if !&readonly
+    " Make trailing whitespace be flagged as bad.
+    syn match BadWhitespace /\s\+$/ containedin=ALL
+    " Make space before tab be flagged as bad and vice versa
+    syn match BadWhitespace / \+\t/ containedin=ALL
+    syn match BadWhitespace /\t \+/ containedin=ALL
+  endif
+endfunction
+
+" Make trailing whitespace be flagged as bad.
+au BufRead,BufNewFile * call SetBadWhitespaceSyntax()
+
 let g:airline_powerline_fonts=1
 let g:airline#extensions#tabline#enabled=1
 let g:airline#extensions#branch#enabled=1
@@ -79,6 +97,7 @@ let g:clang_compilation_database = '.'
 let g:python3_host_prog = '/usr/bin/python3'
 " deoplete requires huge startuptime. Delay loading upon first InsertEnter.
 let g:deoplete#enable_at_startup = 0
+let g:deoplete#enable_smart_case = 1
 autocmd InsertEnter * call deoplete#enable()
 
 "augroup pencil
@@ -110,7 +129,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,13 +138,34 @@ 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
+
+" Java completion
+au FileType java setlocal omnifunc=javacomplete#Complete
+au FileType java JCEnable
+" See https://github.com/artur-shaik/vim-Javacomplete2
+" <C-j>ji <leader>ji
+nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
+imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
+" <C-j>ii <leader>jii
+nmap <F5> <Plug>(JavaComplete-Imports-Add)
+imap <F5> <Plug>(JavaComplete-Imports-Add)
+" <C-j>I <leader>jI
+nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
+imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
+" <C-j>R <leader>jR
+nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
+imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
+
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
 au FileType markdown call RagtagInit()
 
-let g:guesslang_langs=[ 'en_US', 'de_AT']
+let g:detectspelllang_langs = {}
+let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
 au BufReadPost * :DetectIndent
 
 au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'