From ce317b737fc508b6f82944e2a61d8104b5808d2d Mon Sep 17 00:00:00 2001
From: Steffen Rademacker <webgefrickel@gmail.com>
Date: Thu, 18 Sep 2014 13:31:02 +0200
Subject: [PATCH] nesnippet fixes

---
 vimrc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vimrc b/vimrc
index 14da6e3..c56dffa 100644
--- a/vimrc
+++ b/vimrc
@@ -397,12 +397,18 @@ inoremap <leader>/ <Esc>:TComment<CR>
 let g:neosnippet#disable_runtime_snippets = { "_": 1 }
 let g:neosnippet#scope_aliases = {}
 let g:neosnippet#scope_aliases['css'] = 'css,scss'
-let g:neosnippet#scope_aliases['php'] = 'php,html'
-let g:neosnippet#snippets_directory='~/.vim/bundle/vim-snippets/snippets'
+let g:neosnippet#scope_aliases['php'] = 'php,html,twig'
+
+" Neosnippet - SuperTab like snippets behavior.
+smap <C-k> <Plug>(neosnippet_expand_or_jump)
 imap <C-k> <Plug>(neosnippet_expand_or_jump)
+xmap <C-k> <Plug>(neosnippet_expand_target)
 imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
       \ "\<Plug>(neosnippet_expand_or_jump)"
       \: pumvisible() ? "\<C-n>" : "\<TAB>"
+smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
+      \ "\<Plug>(neosnippet_expand_or_jump)"
+      \: "\<TAB>"
 
 " For snippet_complete marker.
 if has('conceal')