Merge pull request #530 from yssource/3.0

try to fix #526 issue 1, prevent "<C-k>" from invoking its self looply.
spf13 · Jan 16, 2014 · 529565b · 529565b
2 parents 10b25a1 + 90f6428
commit 529565b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.vimrc b/.vimrc
@@ -655,7 +655,7 @@
                 else
                     imap <silent><expr><C-k> neosnippet#expandable() ?
                                 \ "\<Plug>(neosnippet_expand_or_jump)" : (pumvisible() ?
-                                \ "\<C-e>" : "\<C-k>")
+                                \ "\<C-e>" : "\<Plug>(neosnippet_expand_or_jump)")
                     smap <TAB> <Right><Plug>(neosnippet_jump_or_expand)
 
                     inoremap <expr><C-g> neocomplete#undo_completion()
@@ -729,7 +729,7 @@
                 else
                     imap <silent><expr><C-k> neosnippet#expandable() ?
                                 \ "\<Plug>(neosnippet_expand_or_jump)" : (pumvisible() ?
-                                \ "\<C-e>" : "\<C-k>")
+                                \ "\<C-e>" : "\<Plug>(neosnippet_expand_or_jump)")
                     smap <TAB> <Right><Plug>(neosnippet_jump_or_expand)
 
                     inoremap <expr><C-g> neocomplcache#undo_completion()