Auto merge of #3306 - bstaletic:neovim_has_python_compiled, r=micbou
[READY] Restore neovim support # PR Prelude Thank you for working on YCM! :) **Please complete these steps and check these boxes (by putting an `x` inside the brackets) _before_ filing your PR:** - [x] I have read and understood YCM's [CONTRIBUTING][cont] document. - [x] I have read and understood YCM's [CODE_OF_CONDUCT][code] document. - [x] I have included tests for the changes in my PR. If not, I have included a rationale for why I haven't. - [x] **I understand my PR may be closed if it becomes obvious I didn't actually perform all of these steps.** # Why this change is necessary and useful [Please explain **in detail** why the changes in this PR are needed.] [cont]: https://github.com/Valloric/YouCompleteMe/blob/master/CONTRIBUTING.md [code]: https://github.com/Valloric/YouCompleteMe/blob/master/CODE_OF_CONDUCT.md Turns out neovim doesn't have `has('python_compiled')`, so we need to check if the user is running neovim before checking `has('python_compiled')`. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/3306) <!-- Reviewable:end -->
This commit is contained in:
commit
48c3bcc491
@ -54,7 +54,8 @@ elseif !has( 'timers' )
|
|||||||
\ echohl None
|
\ echohl None
|
||||||
call s:restore_cpo()
|
call s:restore_cpo()
|
||||||
finish
|
finish
|
||||||
elseif !has( 'python_compiled' ) && !has( 'python3_compiled' )
|
elseif ( v:version > 800 || ( v:version == 800 && has( 'patch1436' ) ) ) &&
|
||||||
|
\ !has( 'python_compiled' ) && !has( 'python3_compiled' )
|
||||||
echohl WarningMsg |
|
echohl WarningMsg |
|
||||||
\ echomsg "YouCompleteMe unavailable: requires Vim compiled with " .
|
\ echomsg "YouCompleteMe unavailable: requires Vim compiled with " .
|
||||||
\ "Python (2.7.1+ or 3.4+) support." |
|
\ "Python (2.7.1+ or 3.4+) support." |
|
||||||
|
Loading…
Reference in New Issue
Block a user