From db78d9690ede26dfc3f75c773c07dd6bdce9ffe2 Mon Sep 17 00:00:00 2001 From: Kiril Vladimirov Date: Thu, 24 Mar 2022 11:50:47 +0200 Subject: [PATCH] Upgrade vim-plug and make it work with neovim --- Makefile | 1 + autoload/plug.vim | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9715b45..c31fad6 100644 --- a/Makefile +++ b/Makefile @@ -10,3 +10,4 @@ update: install-nvim: [[ -d ~/.config/nvim ]] || ln -s ~/.vim ~/.config/nvim [[ -f ~/.config/nvim/init.vim ]] || ln -s ~/.vimrc ~/.config/nvim/init.vim + [[ -d ~/.local/share/nvim/plugged ]] || ln -s ~/.vim/plugged ~/.local/share/nvim/plugged diff --git a/autoload/plug.vim b/autoload/plug.vim index 6a958cb..8a195d3 100644 --- a/autoload/plug.vim +++ b/autoload/plug.vim @@ -242,6 +242,8 @@ function! plug#begin(...) let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) elseif exists('g:plug_home') let home = s:path(g:plug_home) + elseif has('nvim') + let home = stdpath('data') . '/plugged' elseif !empty(&rtp) let home = s:path(split(&rtp, ',')[0]) . '/plugged' else @@ -405,7 +407,7 @@ function! plug#end() for [map, names] in items(lod.map) for [mode, map_prefix, key_prefix] in - \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] + \ [['i', '', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']] execute printf( \ '%snoremap %s %s:call lod_map(%s, %s, %s, "%s")', \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix) @@ -1208,7 +1210,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) -- 2.38.5