diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-05 00:11:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-05 00:11:28 +0100 |
| commit | e509576e531acf6a97ef5b471e25bbe8c77414a8 (patch) | |
| tree | d9febcf62d2f4199be701919993753758eb57b9a | |
| parent | c07e48a900bb8b6d865eb6c65ae0f6fb9f96322e (diff) | |
| download | rneovim-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
| -rw-r--r-- | runtime/autoload/provider/node.vim | 2 | ||||
| -rw-r--r-- | runtime/autoload/provider/pythonx.vim | 4 | ||||
| -rw-r--r-- | runtime/autoload/provider/ruby.vim | 2 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 6 |
4 files changed, 6 insertions, 8 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 diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 9bd73df7fe..6dffd6f05e 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3379,9 +3379,7 @@ expand({expr} [, {nosuf} [, {list}]]) *expand()* If {list} is given and it is |TRUE|, a List will be returned. Otherwise the result is a String and when there are several - matches, they are separated by <NL> characters. [Note: in - version 5.0 a space was used, which caused problems when a - file name contains a space] + matches, they are separated by <NL> characters. If the expansion fails, the result is an empty string. A name for a non-existing file is not included, unless {expr} does @@ -3442,7 +3440,7 @@ expand({expr} [, {nosuf} [, {list}]]) *expand()* all "README" files in the current directory and below: > :echo expand("**/README") < - Expand() can also be used to expand variables and environment + expand() can also be used to expand variables and environment variables that are only known in a shell. But this can be slow, because a shell may be used to do the expansion. See |expr-env-expand|. |