VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-08 14:54:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into away

Browse Source
This commit is contained in:
Dave Halter
2016-07-03 15:46:55 +02:00
parent 6a8138d185 070ee0cc2f
commit a02b07bcb8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.rst
View File

@@ -32,7 +32,7 @@ It's really easy.
Jedi can currently be used with the following editors: Jedi can currently be used with the following editors:
- Vim (jedi-vim_, YouCompleteMe_) - Vim (jedi-vim_, YouCompleteMe_, deoplete-jedi_)
- Emacs (Jedi.el_, company-mode_, elpy_, anaconda-mode_, ycmd_) - Emacs (Jedi.el_, company-mode_, elpy_, anaconda-mode_, ycmd_)
- Sublime Text (SublimeJEDI_ [ST2 + ST3], anaconda_ [only ST3]) - Sublime Text (SublimeJEDI_ [ST2 + ST3], anaconda_ [only ST3])
- SynWrite_ - SynWrite_
@@ -191,6 +191,7 @@ Acknowledgements
.. _jedi-vim: https://github.com/davidhalter/jedi-vim .. _jedi-vim: https://github.com/davidhalter/jedi-vim
.. _youcompleteme: http://valloric.github.io/YouCompleteMe/ .. _youcompleteme: http://valloric.github.io/YouCompleteMe/
.. _deoplete-jedi: https://github.com/zchee/deoplete-jedi
.. _Jedi.el: https://github.com/tkf/emacs-jedi .. _Jedi.el: https://github.com/tkf/emacs-jedi
.. _company-mode: https://github.com/syohex/emacs-company-jedi .. _company-mode: https://github.com/syohex/emacs-company-jedi
.. _elpy: https://github.com/jorgenschaefer/elpy .. _elpy: https://github.com/jorgenschaefer/elpy

2
docs/docs/usage.rst
View File

@@ -21,6 +21,7 @@ Vim:
- jedi-vim_ - jedi-vim_
- YouCompleteMe_ - YouCompleteMe_
- deoplete-jedi_
Emacs: Emacs:
@@ -94,6 +95,7 @@ Using a custom ``$HOME/.pythonrc.py``
.. _jedi-vim: https://github.com/davidhalter/jedi-vim .. _jedi-vim: https://github.com/davidhalter/jedi-vim
.. _youcompleteme: http://valloric.github.io/YouCompleteMe/ .. _youcompleteme: http://valloric.github.io/YouCompleteMe/
.. _deoplete-jedi: https://github.com/zchee/deoplete-jedi
.. _Jedi.el: https://github.com/tkf/emacs-jedi .. _Jedi.el: https://github.com/tkf/emacs-jedi
.. _elpy: https://github.com/jorgenschaefer/elpy .. _elpy: https://github.com/jorgenschaefer/elpy
.. _anaconda-mode: https://github.com/proofit404/anaconda-mode .. _anaconda-mode: https://github.com/proofit404/anaconda-mode