X-Git-Url: https://git.sthu.org/?p=vimconf.git;a=blobdiff_plain;f=init.vim;h=21e8f9a4704df75770bec602831f8ff214f883d8;hp=e8dac98d6375e37a557a6cecd6515294f8259663;hb=a50d445c0e555e50f7250a96ed5a027617b93335;hpb=1b13e6bf6859f089faf9fd922e9df5c2d69e1ddc

diff --git a/init.vim b/init.vim
index e8dac98..21e8f9a 100644
--- a/init.vim
+++ b/init.vim
@@ -6,6 +6,8 @@
 " Some global settings
 
 set nocompatible
+" Breaks colors for some versions of mosh, but not if tmux is used on top of
+" mosh. See https://github.com/mobile-shell/mosh/issues/928
 set termguicolors
 set number
 set cursorline
@@ -31,6 +33,7 @@ set hlsearch
 
 set colorcolumn=+1
 set mouse=a
+set wildmenu
 set wildmode=longest,list:full
 
 set tabpagemax=100
@@ -154,40 +157,26 @@ au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/
 " Line wrap crippled with numbers shown
 au Filetype man setlocal 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
+" Consider using localvimrc config file or editorconfig instead
+"au BufReadPost *.java :DetectIndent
+
+au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
+au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
+
+au BufEnter *.cpp,*.cc,*.cxx let b:fswitchdst='h,hxx,hpp,hh'
+au BufEnter *.h,*.hh,*.hxx let b:fswitchdst='cc,c,cxx,cpp'
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Some plugin-specific settings
 
+let g:localvimrc_persistent = 1
+
 au FileType markdown call RagtagInit()
 
 let g:detectspelllang_langs = {}
 let g:detectspelllang_langs.aspell =[ 'en_US', 'de_AT']
-au BufReadPost *.java :DetectIndent
-
-au BufEnter *.c* let b:fswitchlocs='reg:/lib/include/,rel:.'
-au BufEnter *.h* let b:fswitchlocs='reg:/include/lib/,rel:.'
-
-au BufEnter *.cpp,*.cc,*.cxx let b:fswitchdst='h,hxx,hpp,hh'
-au BufEnter *.h,*.hh,*.hxx let b:fswitchdst='cc,c,cxx,cpp'
 
 :let g:org_todo_keywords = [['TODO(t)', 'WAITING(w)', '|', 'DONE(d)'],
       \ ['|', 'OBSOLETE(o)', 'WONT(n)'],
@@ -198,6 +187,23 @@ let g:vimwiki_list = [{'path': '~/.vimwiki/',
       \ 'template_default': 'default',
       \ 'template_ext': '.html'}]
 
+" 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
+au FileType java nmap <F4> <Plug>(JavaComplete-Imports-AddSmart)
+au FileType java imap <F4> <Plug>(JavaComplete-Imports-AddSmart)
+" <C-j>ii <leader>jii
+au FileType java nmap <F5> <Plug>(JavaComplete-Imports-Add)
+au FileType java imap <F5> <Plug>(JavaComplete-Imports-Add)
+" <C-j>I <leader>jI
+au FileType java nmap <F6> <Plug>(JavaComplete-Imports-AddMissing)
+au FileType java imap <F6> <Plug>(JavaComplete-Imports-AddMissing)
+" <C-j>R <leader>jR
+au FileType java nmap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
+au FileType java imap <F7> <Plug>(JavaComplete-Imports-RemoveUnused)
+
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""