X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=20d9cb680867f700b7c6f5ee0c5b01ba369c870d;hp=d4a51e098d649737b046a296ab7d6dc9239b0d2f;hb=1efe691122790ce96466f1a05fc65de61b91c3cf;hpb=5dd0a0ca1362f81a717de9d924986bdabc4c66aa

diff --git a/init.vim b/init.vim
index d4a51e0..20d9cb6 100644
--- a/init.vim
+++ b/init.vim
@@ -33,6 +33,8 @@ set colorcolumn=+1
 set mouse=a
 set wildmode=longest,list:full
 
+set tabpagemax=100
+
 if has('nvim')
     set guicursor=
 end
@@ -40,17 +42,39 @@ 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
 
+" Some preferences for indent detection
+let g:detectindent_min_indent = 2
+let g:detectindent_preferred_indent = 4
+
+" 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 +103,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
@@ -122,14 +147,34 @@ 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)
+
+" Minimum indenting for source code
+au FileType java,cpp,c,cs let g:detectindent_min_indent = 4
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
 au FileType markdown call RagtagInit()
 
-let g:guesslang_langs=[ 'en_US', 'de_AT']
-au BufReadPost * :DetectIndent
+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:.'
 au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'