Permalink
Browse files

Fix snipmate error

  • Loading branch information...
1 parent d6619e8 commit 9f843b9f21268303124964629d90bc4fadac0a6e @humiaozuzu committed Sep 8, 2013
Showing with 9 additions and 9 deletions.
  1. +4 −5 bundles.vim
  2. +5 −4 vimrc
View
9 bundles.vim
@@ -12,13 +12,12 @@ Bundle 'gmarik/vundle'
" Code Completions
"------------------
Bundle 'Shougo/neocomplcache'
-Bundle 'Shougo/neosnippet'
-Bundle 'honza/vim-snippets'
-Bundle 'ervandew/supertab'
-"Bundle 'honza/snipmate-snippets'
-"Bundle 'mattn/zencoding-vim'
Bundle 'mattn/emmet-vim'
Bundle 'Raimondi/delimitMate'
+Bundle 'ervandew/supertab'
+" snippets
+Bundle 'garbas/vim-snipmate'
+Bundle 'honza/vim-snippets'
"------ snipmate dependencies -------
Bundle 'MarcWeber/vim-addon-mw-utils'
Bundle 'tomtom/tlib_vim'
View
9 vimrc
@@ -170,8 +170,10 @@ let g:neocomplcache_min_syntax_length = 3
let g:neocomplcache_lock_buffer_name_pattern = '\*ku\*'
set completeopt-=preview
-imap <C-k> <Plug>(neosnippet_expand_or_jump)
-smap <C-k> <Plug>(neosnippet_expand_or_jump)
+imap <C-k> <Plug>(neocomplcache_snippets_force_expand)
+smap <C-k> <Plug>(neocomplcache_snippets_force_expand)
+imap <C-l> <Plug>(neocomplcache_snippets_force_jump)
+smap <C-l> <Plug>(neocomplcache_snippets_force_jump)
" Enable omni completion.
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
@@ -185,7 +187,7 @@ endif
let g:neocomplcache_omni_patterns.erlang = '[a-zA-Z]\|:'
" SuperTab
-"let g:SuperTabDefultCompletionType='context'
+" let g:SuperTabDefultCompletionType='context'
let g:SuperTabDefaultCompletionType = '<C-X><C-U>'
let g:SuperTabRetainCompletionType=2
@@ -234,7 +236,6 @@ nmap <D-[> <<
vmap <D-[> <gv
vmap <D-]> >gv
-
" eggcache vim
nnoremap ; :
:command W w

0 comments on commit 9f843b9

Please sign in to comment.