Merge remote-tracking branch 'aschrab/no_python_warning' into develop

This commit is contained in:
Kim Silkebækken 2013-08-20 16:50:27 +02:00
commit fabc45f1dc
2 changed files with 8 additions and 2 deletions

View File

@ -455,6 +455,10 @@ Vim configuration can be overridden using the following options:
directory which will be searched for configuration. When this option is directory which will be searched for configuration. When this option is
present, none of the other locations are searched. present, none of the other locations are searched.
``g:powerline_no_python_error``
If this variable is set to a true value it will prevent Powerline from reporting
an error when loaded in a copy of vim without the necessary Python support.
Powerline script overrides Powerline script overrides
-------------------------- --------------------------

View File

@ -10,8 +10,10 @@ function! s:CriticalError(message)
endfunction endfunction
if ! has('python') && ! has('python3') if ! has('python') && ! has('python3')
call s:CriticalError('You need vim compiled with Python 2.6+ or 3.2+ support if !exists('g:powerline_no_python_error')
\ for Powerline to work. Please consult the documentation for more details.') call s:CriticalError('You need vim compiled with Python 2.6+ or 3.2+ support
\ for Powerline to work. Please consult the documentation for more details.')
endif
finish finish
endif endif