Permalink
Browse files

Added commented-out jedi stuff

  • Loading branch information...
1 parent 01b4561 commit e2fae9254936e8d804e7e439d2c5444e6211ee21 @dbrgn committed Apr 14, 2013
Showing with 12 additions and 1 deletion.
  1. +2 −0 .gitignore
  2. +10 −1 .vimrc
View
@@ -1,2 +1,4 @@
.netrwhist
.vim/bundle/
+*.pyc
+*.swp
View
@@ -28,9 +28,13 @@ Bundle 'Command-T'
" Ultisnips
Bundle 'SirVer/ultisnips'
-" Autocompletion
+" Autocompletion (YCM)
Bundle 'Valloric/YouCompleteMe'
+" Autocompletion (Supertab/Jedi)
+"Bundle 'ervandew/supertab'
+"Bundle 'davidhalter/jedi-vim'
+
" Python plugins
Bundle 'vim-flake8'
Bundle 'fs111/pydoc.vim'
@@ -158,6 +162,11 @@ let g:CommandTAcceptSelectionSplitMap = "<C-CR>"
" Configure YCM
let g:ycm_autoclose_preview_window_after_completion=1
+" Configure Supertab / Jedi
+" au FileType python set omnifunc=jedi#complete
+" let g:SuperTabDefaultCompletionType = "context"
+" set completeopt=menuone,longest,preview
+
" Configure UltiSnips
let g:UltiSnipsExpandTrigger = "<C-x>"
let g:UltiSnipsListSnippets = "<C-l>"

0 comments on commit e2fae92

Please sign in to comment.