Permalink
Browse files

added the new snipmate

  • Loading branch information...
1 parent ebeb9ec commit 6cca8b4b85b20d29f5dc941f983352af0768172d @sontek committed Apr 5, 2012
Showing with 19 additions and 5 deletions.
  1. +12 −0 .gitmodules
  2. +1 −0 _vim/bundle/snipmate
  3. +1 −0 _vim/bundle/snippets
  4. +1 −0 _vim/bundle/tlib
  5. +1 −0 _vim/bundle/vim-addon-mw-utils
  6. +3 −5 _vimrc
View
@@ -49,3 +49,15 @@
[submodule "_vim/bundle/markdown"]
path = _vim/bundle/markdown
url = https://github.com/plasticboy/vim-markdown.git
+[submodule "_vim/bundle/snipmate"]
+ path = _vim/bundle/snipmate
+ url = https://github.com/garbas/vim-snipmate.git
+[submodule "_vim/bundle/vim-addon-mw-utils"]
+ path = _vim/bundle/vim-addon-mw-utils
+ url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "_vim/bundle/tlib"]
+ path = _vim/bundle/tlib
+ url = https://github.com/tomtom/tlib_vim.git
+[submodule "_vim/bundle/snippets"]
+ path = _vim/bundle/snippets
+ url = https://github.com/honza/snipmate-snippets.git
Submodule snipmate added at f1e851
Submodule snippets added at 009bd3
Submodule tlib added at 4bfa2d
View
8 _vimrc
@@ -262,12 +262,10 @@ inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
" ==========================================================
au BufRead *.js set makeprg=jslint\ %
-" Don't allow snipmate to take over tab
-autocmd VimEnter * ino <c-j> <c-r>=TriggerSnippet()<cr>
" Use tab to scroll through autocomplete menus
-autocmd VimEnter * imap <expr> <Tab> pumvisible() ? "<C-N>" : "<Tab>"
-autocmd VimEnter * imap <expr> <S-Tab> pumvisible() ? "<C-P>" : "<S-Tab>"
-snor <c-j> <esc>i<right><c-r>=TriggerSnippet()<cr>
+"autocmd VimEnter * imap <expr> <Tab> pumvisible() ? "<C-N>" : "<Tab>"
+"autocmd VimEnter * imap <expr> <S-Tab> pumvisible() ? "<C-P>" : "<S-Tab>"
+
let g:acp_completeoptPreview=1
" ===========================================================

0 comments on commit 6cca8b4

Please sign in to comment.