From ed8dcf6f5dc8394baac474414ef3aa45be56434a Mon Sep 17 00:00:00 2001 From: York Wong Date: Tue, 5 Feb 2013 17:35:45 +0800 Subject: [PATCH 1/3] Fix #80 "Not an editor command: Python << PYTHONEOF" --- autoload/jedi.vim | 5 +++++ plugin/jedi.vim | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/autoload/jedi.vim b/autoload/jedi.vim index 997a4cd..b1041a7 100644 --- a/autoload/jedi.vim +++ b/autoload/jedi.vim @@ -159,6 +159,11 @@ function! jedi#configure_function_definition() autocmd CursorMovedI call jedi#show_func_def() endfunction +if has('python') + command! -nargs=1 Python python +else + command! -nargs=1 Python python3 +end Python << PYTHONEOF """ here we initialize the jedi stuff """ diff --git a/plugin/jedi.vim b/plugin/jedi.vim index e7ee905..707ad1d 100644 --- a/plugin/jedi.vim +++ b/plugin/jedi.vim @@ -51,11 +51,4 @@ if g:jedi#auto_initialization " order of invocation. autocmd FileType Python setlocal omnifunc=jedi#complete switchbuf=useopen " needed for pydoc endif - -if has('python') - command! -nargs=1 Python python -else - command! -nargs=1 Python python3 -end - " vim: set et ts=4: From 15605d77d69819d61abdaa319773fcfc1c2c02b5 Mon Sep 17 00:00:00 2001 From: Patrice Peterson Date: Fri, 1 Mar 2013 13:06:00 +0100 Subject: [PATCH 2/3] Silence dot completion mappings I find the long line that pops up in the command-line whenever I press `.` a bit distracting, and it would potentially overwrite other useful information displayed in there. This change silences the dot completion commands. --- ftplugin/python/jedi.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ftplugin/python/jedi.vim b/ftplugin/python/jedi.vim index 3bf131c..80691f2 100644 --- a/ftplugin/python/jedi.vim +++ b/ftplugin/python/jedi.vim @@ -41,13 +41,13 @@ end if g:jedi#popup_on_dot if stridx(&completeopt, 'longest') > -1 if g:jedi#popup_select_first - inoremap . .=jedi#do_popup_on_dot() ? "\C-X>\C-O>\C-N>" : "" + inoremap . .=jedi#do_popup_on_dot() ? "\C-X>\C-O>\C-N>" : "" else - inoremap . .=jedi#do_popup_on_dot() ? "\C-X>\C-O>" : "" + inoremap . .=jedi#do_popup_on_dot() ? "\C-X>\C-O>" : "" end else - inoremap . .=jedi#do_popup_on_dot() ? "\C-X>\C-O>\C-P>" : "" + inoremap . .=jedi#do_popup_on_dot() ? "\C-X>\C-O>\C-P>" : "" end end From 211cbf1fb7e95bb265c25f67941ec049b361ce8d Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Thu, 25 Apr 2013 10:27:58 +0200 Subject: [PATCH 3/3] Changed jedi submodule protocol (fixes #129) --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4398449..3bfce98 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "jedi"] path = jedi - url = git://github.com/davidhalter/jedi.git + url = https://github.com/davidhalter/jedi.git