Fix F3 imports completion with latest vim-lsp

[dotfiles.git] / vim / .vimrc

diff --git a/vim/.vimrc b/vim/.vimrc
index 1b2060ee9692c794111a8e64115e977a4ca3b0c2..47a2c07dafcfd48e81237b51a92bccc9922c31ff 100644 (file)
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -73,6 +73,7 @@ highlight CursorColumn ctermfg=cyan ctermbg=red
 " }}}
 
 " Statusline {{{
+let MeinStatus = {-> exists("b:mein_status_func") ? b:mein_status_func() : ""}
 set laststatus=2
 set statusline=%F\ %m%r%h%w%k
 set statusline+=%{len(getqflist())?'[Q]':''}
@@ -83,17 +84,13 @@ set statusline+=%#DiffChange#%{strlen(&fenc)?&fenc:&enc}%{&bomb?'-bom':''}\ %{&f
 set statusline+=%#DiffAdd#%l/%L
 set statusline+=%#Todo#%c%V:0x%B
 set statusline+=%#Comment#%o
-set statusline+=%#Error#%{LintStatus()}
+set statusline+=%#Error#%{MeinStatus()}
 set statusline+=%*\ %P
-
-function! LintStatus() " it is overrided in ftplugins
-    return ""
-endfunction
 " }}}
 
 " View saving {{{
 autocmd BufWinLeave ?* silent! if &ft !=# "gitcommit" | mkview | endif
-autocmd BufWinEnter ?* silent loadview
+autocmd BufWinEnter ?* silent! loadview
 " }}}
 
 " Windows related {{{
@@ -161,6 +158,7 @@ vnoremap <leader>d "_d
 map Q gq
 cmap ][ '[,']
 imap <C-b> <C-x><C-o>
+imap <C-@> <C-x><C-f>
 nmap <Tab> :buffers<CR>:b<Space>
 nmap <silent> <Home> :registers<CR>
 nmap <leader>' yiwciw"<C-r>""<ESC>