psi-jack/ultimate-vim
1
0
Fork 0
mirror of synced 2024-11-22 16:55:34 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/vsooda/vimrc

Browse source
This commit is contained in:
liushouda 2015-09-08 10:43:55 +08:00
commit d45679d256
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sources_non_forked/jedi-vim/AUTHORS.txt
View file

@ -45,6 +45,7 @@ Justin Cheevers @justincheevers
Talha Ahmed (@talha81) <talha.ahmed@gmail.com> Talha Ahmed (@talha81) <talha.ahmed@gmail.com>
Matthew Tylee Atkinson (@matatk) Matthew Tylee Atkinson (@matatk)
Pedro Ferrari (@petobens) Pedro Ferrari (@petobens)
Daniel Hahler (@blueyed)
Dave Honneffer (@pearofducks) Dave Honneffer (@pearofducks)

3
sources_non_forked/jedi-vim/README.rst
View file

@ -88,7 +88,8 @@ Example Installation Command using Pathogen:
On Arch Linux, you can also install jedi-vim from official repositories as `vim-jedi On Arch Linux, you can also install jedi-vim from official repositories as `vim-jedi
<https://www.archlinux.org/packages/community/any/vim-jedi/>`__. It is also available <https://www.archlinux.org/packages/community/any/vim-jedi/>`__. It is also available
on `Debian (≥8) <https://packages.debian.org/vim-python-jedi>`__ and `Ubuntu (≥14.04) on `Debian (≥8) <https://packages.debian.org/vim-python-jedi>`__ and `Ubuntu (≥14.04)
<http://packages.ubuntu.com/vim-python-jedi>`__ as vim-python-jedi. <http://packages.ubuntu.com/vim-python-jedi>`__ as vim-python-jedi. On Fedora Linux,
it is available as `vim-jedi <https://apps.fedoraproject.org/packages/vim-jedi>`__.
Note that the `python-mode <https://github.com/klen/python-mode>`_ VIM plugin seems Note that the `python-mode <https://github.com/klen/python-mode>`_ VIM plugin seems
to conflict with jedi-vim, therefore you should disable it before enabling to conflict with jedi-vim, therefore you should disable it before enabling

2
sources_non_forked/jedi-vim/autoload/jedi.vim
View file

@ -70,7 +70,7 @@ function! s:init_python()
" avoids starting both of them. " avoids starting both of them.
" Get default python version from interpreter in $PATH. " Get default python version from interpreter in $PATH.
let s:def_py = system("python -c 'import sys; sys.stdout.write(str(sys.version_info[0]))'") let s:def_py = system('python -c '.shellescape('import sys; sys.stdout.write(str(sys.version_info[0]))'))
if v:shell_error != 0 || !len(s:def_py) if v:shell_error != 0 || !len(s:def_py)
if !exists("g:jedi#squelch_py_warning") if !exists("g:jedi#squelch_py_warning")
echohl WarningMsg echohl WarningMsg