Updated .gitignore

.gitignore

@@ -1,4 +1,4 @@
-vim/autoload/*.old
+vim/autoload/**old
 vim/plugged/
 vim/.netrwhist
 

vim/autoload/plug.vim

@@ -96,7 +96,7 @@ let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
 let s:plug_tab = get(s:, 'plug_tab', -1)
 let s:plug_buf = get(s:, 'plug_buf', -1)
 let s:mac_gui = has('gui_macvim') && has('gui_running')
-let s:is_win = has('win32') || has('win64')
+let s:is_win = has('win32')
 let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win)
 let s:vim8 = has('patch-8.0.0039') && exists('*job_start')
 let s:me = resolve(expand('<sfile>:p'))
@@ -763,6 +763,9 @@ function! s:prepare(...)
     execute 'silent! unmap <buffer>' k
   endfor
   setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
+  if exists('+colorcolumn')
+    setlocal colorcolumn=
+  endif
   setf vim-plug
   if exists('g:syntax_on')
     call s:syntax()
@@ -2426,8 +2429,13 @@ function! s:diff()
         \ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))
 
   if cnts[0] || cnts[1]
-    nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
-    nnoremap <silent> <buffer> o    :silent! call <SID>preview_commit()<cr>
+    nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
+    if empty(maparg("\<cr>", 'n'))
+      nmap <buffer> <cr> <plug>(plug-preview)
+    endif
+    if empty(maparg('o', 'n'))
+      nmap <buffer> o <plug>(plug-preview)
+    endif
   endif
   if cnts[0]
     nnoremap <silent> <buffer> X :call <SID>revert()<cr>

vimrc

@@ -18,7 +18,16 @@ call plug#begin("$VIMHOME/plugged")
   Plug 'pearofducks/ansible-vim'
   if v:version > 704
     Plug 'Valloric/YouCompleteMe'
+    Plug 'prabirshrestha/async.vim'
   endif
+  if has('nvim')
+    Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+  else
+    Plug 'Shougo/deoplete.nvim'
+    Plug 'roxma/nvim-yarp'
+    Plug 'roxma/vim-hug-neovim-rpc'
+  endif
+
 call plug#end()
 
 set number
@@ -53,7 +62,9 @@ let g:syntastic_enable_zsh_checker = 1
 let g:syntastic_enable_bash_checker = 1
 
 " rust lang
-let g:ycm_rust_src_path = '~/.multirust/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc'
+autocmd FileType rust let g:autofmt_autosave = 1
+autocmd FileType rust let g:deoplete#enable_at_startup = 1
+let g:ycm_rust_src_path = expand('~/.multirust/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc')
 
 " Other
 set shiftwidth=2
@@ -71,5 +82,4 @@ cmap w!! w !sudo tee % > /dev/null
 set modeline
 set modelines=7
 
-
 " vim: ts=8 sw=2 si