kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

provider/pythonx: return error from Detect

Browse Source 
Ref: https://github.com/blueyed/neovim/commit/9b653ce0#commitcomment-11195449
This commit is contained in:
Daniel Hahler 2015-05-14 19:26:49 +02:00 committed by Florian Walch
parent 8d42db1eea
commit c148427c89
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/autoload/provider/pythonx.vim
View File

@ -12,9 +12,13 @@ function! provider#pythonx#Detect(ver) abort
\ 'g:python_host_skip_check' : 'g:python3_host_skip_check' \ 'g:python_host_skip_check' : 'g:python3_host_skip_check'
let skip = exists(skip_var) ? {skip_var} : 0 let skip = exists(skip_var) ? {skip_var} : 0
if exists(host_var) if exists(host_var)
" Disable auto detection " Disable auto detection.
let [check, err, _] = s:check_interpreter({host_var}, a:ver, skip) 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 endif
let detect_versions = (a:ver == 2) ? let detect_versions = (a:ver == 2) ?
@ -31,9 +35,8 @@ function! provider#pythonx#Detect(ver) abort
endif endif
endfor endfor
" No Python interpreter return ['', 'provider#pythonx#Detect: could not load Python '.a:ver
return ['', 'Neovim module installed Python' \ .': '.err]
\ .a:ver.' interpreter is not found.']
endfunction endfunction
function! s:check_version(prog, ver, skip) abort function! s:check_version(prog, ver, skip) abort