Permalink
Browse files

fixed some bundle issues.

  • Loading branch information...
1 parent 790f2ac commit 31a44602376b76d2d615f37f6eacfd1c12ff5bc0 @jeffbuttars committed Oct 15, 2012
Showing with 17 additions and 5 deletions.
  1. +9 −3 vimrc/bundles.vim
  2. +1 −0 vimrc/ctrlp.vim
  3. +2 −2 vimrc/supertab.vim
  4. +5 −0 vimrc/ultisnips.vim
View
12 vimrc/bundles.vim
@@ -49,16 +49,21 @@ Bundle 'vcscommand.vim'
Bundle 'vim-scripts/tComment'
Bundle 'ZenCoding.vim'
Bundle 'Gundo'
-Bundle 'ack.vim'
Bundle 'fugitive.vim'
Bundle 'The-NERD-tree'
-Bundle 'SuperTab-continued.'
Bundle 'Conque'
Bundle 'Solarized'
Bundle 'simple-pairs'
Bundle 'Syntastic'
Bundle 'Python-mode-klen'
+" Bundle 'argtextobj.vim'
+" Bundle 'textobj-indent'
+" Bundle 'django-template-textobjects'
+
+" Bundle 'SuperTab-continued.'
+Bundle 'neocomplcache'
+
" https://lampsvn.epfl.ch/trac/scala/browser/scala-tool-support/trunk/src/vim
" Bundle 'scala'
@@ -88,6 +93,7 @@ Bundle 'twilight'
Bundle 'Twilight-for-python'
Bundle 'https://github.com/tpope/vim-vividchalk'
Bundle 'https://github.com/w0ng/vim-hybrid'
-Bundle 'https://github.com/vim-scripts/summerfruit256'
+" Bundle 'https://github.com/vim-scripts/summerfruit256'
+Bundle 'git://github.com/vim-scripts/summerfruit256.vim.git'
View
1 vimrc/ctrlp.vim
@@ -4,3 +4,4 @@ imap <C-l> <ESC>:CtrlPBuffer<CR>
map <C-l> <ESC>:CtrlPBuffer<CR>
let g:ctrlp_max_height = 30
+let g:ctrlp_clear_cache_on_exit = 0
View
4 vimrc/supertab.vim
@@ -1,2 +1,2 @@
-
-let g:SuperTabDefaultCompletionType = "<c-n>"
+let g:SuperTabDefaultCompletionType = "context"
+let g:SuperTabContextDefaultCompletionType = "<c-p>"
View
5 vimrc/ultisnips.vim
@@ -1,2 +1,7 @@
" UltiSnips
let g:UltiSnipsListSnippets = "<c-q>"
+
+" g:UltiSnipsExpandTrigger <tab>
+" g:UltiSnipsListSnippets <c-tab>
+" g:UltiSnipsJumpForwardTrigger <c-j>
+" g:UltiSnipsJumpBackwardTrigger <c-k>

0 comments on commit 31a4460

Please sign in to comment.