aboutsummaryrefslogtreecommitdiff
path: root/vimrc-full
diff options
context:
space:
mode:
authorMax Christian Pohle2017-06-11 02:59:36 +0200
committerMax Christian Pohle2017-06-11 02:59:36 +0200
commit79655830d8c1daf866697c33ad07ce3b4b4ad920 (patch)
tree3c969c78e33d44fc322cdef915afec6a837cbaef /vimrc-full
parent4e54ce5dddbf493496e6cf751f5df23b13c51637 (diff)
downloadvim-karlmarks-79655830d8c1daf866697c33ad07ce3b4b4ad920.tar.bz2
vim-karlmarks-79655830d8c1daf866697c33ad07ce3b4b4ad920.zip
Fixed: Accidentally deactivated jedi
Diffstat (limited to 'vimrc-full')
-rw-r--r--vimrc-full12
1 files changed, 6 insertions, 6 deletions
diff --git a/vimrc-full b/vimrc-full
index c34cbc9..50d5c25 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -300,12 +300,12 @@ if has("python")
300 " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format) 300 " autocmd FileType c,cpp,objc map <buffer> = <Plug>(operator-clang-format)
301 301
302 " JEDI: ============================================================================================================== 302 " JEDI: ==============================================================================================================
303 " Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures 303 Plug 'davidhalter/jedi-vim' " jedi gets used to display python function signatures
304 " let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe 304 let g:jedi#completions_enabled = 0 " we do not need completions, because we have YouCompleteMe
305 " let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi 305 let g:jedi#show_call_signatures = 1 " which sadly does not support signatures like jedi
306 " let g:jedi#show_call_signatures_delay = 0 306 let g:jedi#show_call_signatures_delay = 0
307 " let g:jedi#auto_vim_configure = 0 307 let g:jedi#auto_vim_configure = 0
308 " let g:pymode_rope = 0 " https://github.com/davidhalter/jedi-vim/issues/163 308 let g:pymode_rope = 0 " https://github.com/davidhalter/jedi-vim/issues/163
309 " autocmd FileType python jedi.preload_module('os', 'sys', 'math') 309 " autocmd FileType python jedi.preload_module('os', 'sys', 'math')
310 " let g:pymode_options_max_line_length = 120 310 " let g:pymode_options_max_line_length = 120
311 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301' 311 " let g:syntastic_python_flake8_args='--ignore=F821,E302,E501,E241,E301'
..