aboutsummaryrefslogtreecommitdiff
path: root/runtime/autoload
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-12-05 00:11:28 +0100
committerGitHub <noreply@github.com>2018-12-05 00:11:28 +0100
commite509576e531acf6a97ef5b471e25bbe8c77414a8 (patch)
treed9febcf62d2f4199be701919993753758eb57b9a /runtime/autoload
parentc07e48a900bb8b6d865eb6c65ae0f6fb9f96322e (diff)
downloadrneovim-e509576e531acf6a97ef5b471e25bbe8c77414a8.tar.gz
rneovim-e509576e531acf6a97ef5b471e25bbe8c77414a8.tar.bz2
rneovim-e509576e531acf6a97ef5b471e25bbe8c77414a8.zip
provider/lang: expand() g:foo_host_prog (#9312)
Before this commit, if user does this: let g:node_host_prog = '~/.nvm/versions/node/v11.3.0/bin/neovim-node-host' the "~/" is not expanded to user's home directory. `:help g:ruby_host_prog` suggests a path with "~/" so technically we already claimed to support this. closes https://github.com/neovim/node-client/issues/102
Diffstat (limited to 'runtime/autoload')
-rw-r--r--runtime/autoload/provider/node.vim2
-rw-r--r--runtime/autoload/provider/pythonx.vim4
-rw-r--r--runtime/autoload/provider/ruby.vim2
3 files changed, 4 insertions, 4 deletions
diff --git a/runtime/autoload/provider/node.vim b/runtime/autoload/provider/node.vim
index 48ea10aed6..35882849bd 100644
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -49,7 +49,7 @@ endfunction
function! provider#node#Detect() abort
if exists('g:node_host_prog')
- return g:node_host_prog
+ return expand(g:node_host_prog)
endif
if !s:is_minimum_version(v:null, 6, 0)
return ''
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index 258aff61b3..b8e2ded00d 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -24,13 +24,13 @@ endfunction
function! provider#pythonx#Detect(major_ver) abort
if a:major_ver == 2
if exists('g:python_host_prog')
- return [g:python_host_prog, '']
+ return [expand(g:python_host_prog), '']
else
let progs = ['python2', 'python2.7', 'python2.6', 'python']
endif
else
if exists('g:python3_host_prog')
- return [g:python3_host_prog, '']
+ return [expand(g:python3_host_prog), '']
else
let progs = ['python3', 'python3.7', 'python3.6', 'python3.5',
\ 'python3.4', 'python3.3', 'python']
diff --git a/runtime/autoload/provider/ruby.vim b/runtime/autoload/provider/ruby.vim
index ed9436750b..3b4c6c4839 100644
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -45,7 +45,7 @@ endfunction
function! s:detect()
if exists("g:ruby_host_prog")
- return g:ruby_host_prog
+ return expand(g:ruby_host_prog)
elseif has('win32')
return exepath('neovim-ruby-host.bat')
else