summaryrefslogtreecommitdiffstats
path: root/vim/vimrc
diff options
context:
space:
mode:
authoryushyin <yushyin@saga>2016-11-27 13:07:49 +0100
committeryushyin <yushyin@saga>2016-11-27 13:07:49 +0100
commit2ab0212180ffcd1a1367a52517ffaa0174eb9f2c (patch)
treebdd03d19dfd177e12108b09cbca59e1a38d00687 /vim/vimrc
parentf5efb20b4c820121d29814fec8f7296ffc9913ae (diff)
downloaddotfiles-2ab0212180ffcd1a1367a52517ffaa0174eb9f2c.tar.gz
dotfiles-2ab0212180ffcd1a1367a52517ffaa0174eb9f2c.tar.xz
Vim: Replace ultisnips with neosnippet
Diffstat (limited to 'vim/vimrc')
-rw-r--r--vim/vimrc9
1 files changed, 6 insertions, 3 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 6f79be6..a3faa66 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -60,9 +60,12 @@ if neobundle#tap('vimfiler.vim')
let neobundle#hooks.on_source = s:plugrc . '/vimfiler.rc.vim'
call neobundle#untap()
endif
-if neobundle#tap('ultisnips')
- let g:UltiSnipsForwardTrigger = "<c-,>"
- let g:UltiSnipsBackwardTrigger = "<c-.>"
+if neobundle#tap('neosnippet.vim')
+ let g:neosnippet#snippets_directory =
+ \ $XDG_CONFIG_HOME . '/vim/snippets'
+ imap <C-k> <Plug>(neosnippet_expand_or_jump)
+ smap <C-k> <Plug>(neosnippet_expand_or_jump)
+ xmap <C-k> <Plug>(neosnippet_expand_or_jump)
call neobundle#untap()
endif
if neobundle#tap('clang_complete')