diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim index 38efd9e..a8b2bf5 100644 --- a/autoload/neosnippet.vim +++ b/autoload/neosnippet.vim @@ -1,7 +1,7 @@ "============================================================================= " FILE: neosnippet.vim " AUTHOR: Shougo Matsushita -" Last Modified: 30 Sep 2012. +" Last Modified: 01 Oct 2012. " License: MIT license {{{ " Permission is hereby granted, free of charge, to any person obtaining " a copy of this software and associated documentation files (the @@ -149,23 +149,21 @@ endfunction"}}} function! neosnippet#expandable()"{{{ let ret = 0 - if neosnippet#force_expandable() + let snippets = neosnippet#get_snippets() + let cur_text = neosnippet#util#get_cur_text() + + " Check snippet trigger. + if s:get_cursor_snippet(snippets, cur_text) != '' let ret += 1 endif + " Check jumpable. if neosnippet#jumpable() let ret += 2 endif return ret endfunction"}}} -function! neosnippet#force_expandable()"{{{ - let snippets = neosnippet#get_snippets() - let cur_text = neosnippet#util#get_cur_text() - - " Found snippet trigger. - return s:get_cursor_snippet(snippets, cur_text) != '' -endfunction"}}} function! neosnippet#jumpable()"{{{ " Found snippet placeholder. return search(s:get_placeholder_marker_pattern(). '\|' diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt index 96db878..3ee38bc 100644 --- a/doc/neosnippet.txt +++ b/doc/neosnippet.txt @@ -390,6 +390,9 @@ snippet *neosnippet-unite-action-snippet* ============================================================================== CHANGELOG *neosnippet-changelog* +2012-10-01 +- Deleted neosnippet#force_expandable(). + 2012-09-30 - Changed runtime directory. - Vitalized.