- Merged.

This commit is contained in:
Shougo Matsushita 2012-09-06 11:00:35 +09:00
commit 589a3287db
2 changed files with 13 additions and 5 deletions

View File

@ -1,7 +1,7 @@
"============================================================================= "=============================================================================
" FILE: snippets_complete.vim " FILE: snippets_complete.vim
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com> " AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
" Last Modified: 05 Sep 2012. " Last Modified: 06 Sep 2012.
" License: MIT license {{{ " License: MIT license {{{
" Permission is hereby granted, free of charge, to any person obtaining " Permission is hereby granted, free of charge, to any person obtaining
" a copy of this software and associated documentation files (the " a copy of this software and associated documentation files (the
@ -499,6 +499,13 @@ function! s:snippets_expand_or_jump(cur_text, col)"{{{
let cur_word = s:get_cursor_keyword_snippet( let cur_word = s:get_cursor_keyword_snippet(
\ neocomplcache#sources#snippets_complete#get_snippets(), \ neocomplcache#sources#snippets_complete#get_snippets(),
\ a:cur_text) \ a:cur_text)
if cur_word == ''
" Check by force_expand.
let cur_word = s:get_cursor_snippet(
\ neocomplcache#sources#snippets_complete#get_snippets(),
\ a:cur_text)
endif
if cur_word != '' if cur_word != ''
" Found snippet trigger. " Found snippet trigger.
call neocomplcache#sources#snippets_complete#expand( call neocomplcache#sources#snippets_complete#expand(

View File

@ -116,10 +116,8 @@ KEY MAPPINGS *neocomplcache-snippets-complete-key-mappings*
Expand a cursor snippet of plural lines. When there is not a Expand a cursor snippet of plural lines. When there is not a
snippet, jump to next placeholder. snippet, jump to next placeholder.
Note: cursor snippet must be match keyword patterns. Note: It searches cursor snippet from keyword patterns in the
For example if snippet name is ".", snippets_complete don't expand it. first.
If you expand snippet ".", Please use
|<Plug>(neocomplcache_snippets_force_expand)|.
<Plug>(neocomplcache_snippets_jump) *<Plug>(neocomplcache_snippets_jump)* <Plug>(neocomplcache_snippets_jump) *<Plug>(neocomplcache_snippets_jump)*
Jump to next placeholder. If there is no placeholder, expand a Jump to next placeholder. If there is no placeholder, expand a
@ -312,6 +310,9 @@ CHANGELOG *neocomplcache-snippets-complete-changelog*
2012-09-06 2012-09-06
- Added neocomplcache__convertable attribute. - Added neocomplcache__convertable attribute.
2012-08-30
- Changed <Plug>(neocomplcache_snippets_expand) behavior.
2012-08-27 2012-08-27
- Fixed neocomplcache#sources#snippets_complete#force_expandable(). - Fixed neocomplcache#sources#snippets_complete#force_expandable().