Skip to content

Commit

Permalink
added the new snipmate
Browse files Browse the repository at this point in the history
  • Loading branch information
sontek committed Apr 5, 2012
1 parent ebeb9ec commit 6cca8b4
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 5 deletions.
12 changes: 12 additions & 0 deletions .gitmodules
Expand Up @@ -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
1 change: 1 addition & 0 deletions _vim/bundle/snipmate
Submodule snipmate added at f1e851
1 change: 1 addition & 0 deletions _vim/bundle/snippets
Submodule snippets added at 009bd3
1 change: 1 addition & 0 deletions _vim/bundle/tlib
Submodule tlib added at 4bfa2d
1 change: 1 addition & 0 deletions _vim/bundle/vim-addon-mw-utils
Submodule vim-addon-mw-utils added at a2676b
8 changes: 3 additions & 5 deletions _vimrc
Expand Up @@ -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

" ===========================================================
Expand Down

0 comments on commit 6cca8b4

Please sign in to comment.