Skip to content

Commit

Permalink
fixed some bundle issues.
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffbuttars committed Oct 15, 2012
1 parent 790f2ac commit 31a4460
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
12 changes: 9 additions & 3 deletions vimrc/bundles.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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'


1 change: 1 addition & 0 deletions vimrc/ctrlp.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions vimrc/supertab.vim
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

let g:SuperTabDefaultCompletionType = "<c-n>"
let g:SuperTabDefaultCompletionType = "context"
let g:SuperTabContextDefaultCompletionType = "<c-p>"
5 changes: 5 additions & 0 deletions vimrc/ultisnips.vim
Original file line number Diff line number Diff line change
@@ -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.