Merge branch 'main' of gitlab.com:rbdr/dotfiles

diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim
index 6a958cb89fa7c145e30872c50bfa859685b9c4dd..ad950410b00e2546c4ccf41d70e1ce5551cd0ef3 100644 (file)
--- a/vim/autoload/plug.vim
+++ b/vim/autoload/plug.vim
@@ -405,7 +405,7 @@ function! plug#end()
 
   for [map, names] in items(lod.map)
     for [mode, map_prefix, key_prefix] in
-          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
+          \ [['i', '<C-\><C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
       execute printf(
       \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
       \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
@@ -1208,7 +1208,8 @@ function! s:update_impl(pull, force, args) abort
   normal! 2G
   silent! redraw
 
-  let s:clone_opt = []
+  " Set remote name, overriding a possible user git config's clone.defaultRemoteName
+  let s:clone_opt = ['--origin', 'origin']
   if get(g:, 'plug_shallow', 1)
     call extend(s:clone_opt, ['--depth', '1'])
     if s:git_version_requirement(1, 7, 10)

diff --git a/vimrc b/vimrc
index d16ba35ae5a53c5287aaf41101efa5a3794105da..fdcc9173b4a6278bb15f18e38c96a020d6500f27 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -214,6 +214,7 @@ Plug 'bumaociyuan/vim-swift'
 Plug 'udalov/kotlin-vim'
 Plug 'tikhomirov/vim-glsl'
 Plug 'jparise/vim-graphql'
+Plug 'digitaltoad/vim-pug'
 
 " Editing
 Plug 'tpope/vim-endwise'
@@ -228,13 +229,7 @@ Plug 'junegunn/limelight.vim'
 " Tools
 Plug 'editorconfig/editorconfig-vim'
 Plug 'dense-analysis/ale'
-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
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
 Plug 'vim-scripts/LargeFile'
 Plug 'tpope/vim-fugitive'
 Plug 'milkypostman/vim-togglelist'