- Merged.

This commit is contained in:
Shougo Matsushita 2012-11-10 10:48:03 +09:00
commit 8da63999f5
2 changed files with 6 additions and 4 deletions

View File

@ -411,11 +411,12 @@ function! s:parse_snippet_name(snippets_file, line, linenr, dup_check)"{{{
" Fall back to using the name and description (abbr) combined. " Fall back to using the name and description (abbr) combined.
" SnipMate snippets may have duplicate names, but different " SnipMate snippets may have duplicate names, but different
" descriptions (abbrs). " descriptions (abbrs).
let description = matchstr(a:line, '^snippet\s\+\zs.*$') let description = matchstr(a:line, '^snippet\s\+\S\+\s\+\zs.*$')
if description !=# snippet_dict.name if description != '' && description !=# snippet_dict.name
" Convert description. " Convert description.
let snippet_dict.name = let snippet_dict.name .= '_' .
\ substitute(description, '\W\+', '_', 'g') \ substitute(substitute(
\ description, '\W\+', '_', 'g'), '_\+$', '', '')
endif endif
" Collect the description (abbr) of the snippet, if set on snippet line. " Collect the description (abbr) of the snippet, if set on snippet line.

View File

@ -717,6 +717,7 @@ CHANGELOG *neosnippet-changelog*
- Fixed error in java snippet. - Fixed error in java snippet.
- Improved snippet rank. - Improved snippet rank.
- Improved keyword filter behavior. - Improved keyword filter behavior.
- Fixed convert description.
2012-11-07 2012-11-07
- Fixed s:indent_snippet(). - Fixed s:indent_snippet().