Merge branch 'master' of github.com:Shougo/neosnippet

This commit is contained in:
Shougo Matsushita
2013-01-12 00:00:16 +09:00
3 changed files with 17 additions and 28 deletions

View File

@@ -285,15 +285,14 @@ neosnippet#expandable()
*neosnippet#expandable()*
You can use this function with imap <expr>. It checks whether
the cursor text is a snippet trigger or a placeholder. This is
is useful to save key mappings. The return values of the
function are:
0: not found
1: the cursor text is a snippet trigger
2: a placeholder exists in the current buffer
3: both found
is useful to save key mappings.
Note: If you used to
|neocomplcache#sources#snippets_complete#expandable()|, you
must use both |neosnippet#expandable()| and
|neosnippet#jumpable()|.
>
imap <expr><C-l> neosnippet#expandable() ?
imap <expr><C-l>
\ neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ?
\ "\<Plug>(neosnippet_expand_or_jump)" : "\<C-n>"
<
*neocomplcache#sources#snippets_complete#expandable()*
@@ -338,10 +337,10 @@ EXAMPLES *neosnippet-examples*
xmap <C-l> <Plug>(neosnippet_start_unite_snippet_target)
" SuperTab like snippets behavior.
"imap <expr><TAB> neosnippet#expandable() ?
"imap <expr><TAB> neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ?
" \ "\<Plug>(neosnippet_expand_or_jump)"
" \: pumvisible() ? "\<C-n>" : "\<TAB>"
"smap <expr><TAB> neosnippet#expandable() ?
"smap <expr><TAB> neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ?
" \ "\<Plug>(neosnippet_expand_or_jump)"
" \: "\<TAB>"
@@ -711,6 +710,9 @@ A: Please try below settings. It defines snipMate function.
==============================================================================
CHANGELOG *neosnippet-changelog*
2013-01-07
- Changed neosnippet#expandable() behavior.
2013-01-02
- Improved initialization timing.