diff options
| author | Daniel Hahler <git@thequod.de> | 2015-05-14 19:26:49 +0200 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2015-06-09 10:29:46 +0300 |
| commit | c148427c89ca8f7ed936f37f016306e06ff5c9b7 (patch) | |
| tree | 9f27da215ac371b882c5ae3ee05b6cbf4d485a6c /runtime/autoload/provider | |
| parent | 8d42db1eeaac03028257513aa093df79efc9c025 (diff) | |
| download | rneovim-c148427c89ca8f7ed936f37f016306e06ff5c9b7.tar.gz rneovim-c148427c89ca8f7ed936f37f016306e06ff5c9b7.tar.bz2 rneovim-c148427c89ca8f7ed936f37f016306e06ff5c9b7.zip | |
provider/pythonx: return error from Detect
Ref: https://github.com/blueyed/neovim/commit/9b653ce0#commitcomment-11195449
Diffstat (limited to 'runtime/autoload/provider')
| -rw-r--r-- | runtime/autoload/provider/pythonx.vim | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim index 0e221458b2..b1e6ff9e3a 100644 --- a/runtime/autoload/provider/pythonx.vim +++ b/runtime/autoload/provider/pythonx.vim @@ -12,9 +12,13 @@ function! provider#pythonx#Detect(ver) abort \ 'g:python_host_skip_check' : 'g:python3_host_skip_check' let skip = exists(skip_var) ? {skip_var} : 0 if exists(host_var) - " Disable auto detection + " Disable auto detection. let [check, err, _] = s:check_interpreter({host_var}, a:ver, skip) - return check ? [{host_var}, err] : ['', err] + if check + return [{host_var}, err] + endif + return ['', 'provider#pythonx#Detect: could not load Python '.a:ver + \ .' (from '.host_var.'): '.err] endif let detect_versions = (a:ver == 2) ? @@ -31,9 +35,8 @@ function! provider#pythonx#Detect(ver) abort endif endfor - " No Python interpreter - return ['', 'Neovim module installed Python' - \ .a:ver.' interpreter is not found.'] + return ['', 'provider#pythonx#Detect: could not load Python '.a:ver + \ .': '.err] endfunction function! s:check_version(prog, ver, skip) abort |