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

Merge pull request #194 from inside/dev

Browse Source 
after/ftplugin/python/jedi.vim takes care of setting the omnifunc, it's not needed in ftplugin/python/jedi.vim anymore.
This commit is contained in:
David Halter
2013-09-24 02:58:31 -07:00
parent 882c5f0611 04c3fc9d1b
commit 21ce925ccb
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
after/ftplugin/python/jedi.vim
View File

@@ -1,3 +1,16 @@
" We need our own omnifunc, so this overrides the omnifunc set by
" $VIMRUNTIME/ftplugin/python.vim.
setlocal omnifunc=jedi#completions
if g:jedi#auto_initialization
if g:jedi#completions_enabled
" We need our own omnifunc, so this overrides the omnifunc set by
" $VIMRUNTIME/ftplugin/python.vim.
setlocal omnifunc=jedi#completions
" map ctrl+space for autocompletion
if g:jedi#completions_command == "<C-Space>"
" in terminals, <C-Space> sometimes equals <Nul>
inoremap <expr> <Nul> jedi#complete_string(0)
endif
if g:jedi#completions_command != ""
execute "inoremap <expr> <buffer> ".g:jedi#completions_command." jedi#complete_string(0)"
endif
endif
endif

13
ftplugin/python/jedi.vim
View File

@@ -6,19 +6,6 @@ endif
" ------------------------------------------------------------------------
if g:jedi#auto_initialization
if g:jedi#completions_enabled
setlocal omnifunc=jedi#completions
" map ctrl+space for autocompletion
if g:jedi#completions_command == "<C-Space>"
" in terminals, <C-Space> sometimes equals <Nul>
inoremap <expr> <Nul> jedi#complete_string(0)
endif
if g:jedi#completions_command != ""
execute "inoremap <expr> <buffer> ".g:jedi#completions_command." jedi#complete_string(0)"
endif
endif
" goto / get_definition / usages
if g:jedi#goto_assignments_command != ''
execute "noremap <buffer>".g:jedi#goto_assignments_command." :call jedi#goto_assignments()<CR>"