- Merged.
This commit is contained in:
commit
589a3287db
@ -1,7 +1,7 @@
|
||||
"=============================================================================
|
||||
" FILE: snippets_complete.vim
|
||||
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
|
||||
" Last Modified: 05 Sep 2012.
|
||||
" Last Modified: 06 Sep 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
|
||||
@ -499,6 +499,13 @@ function! s:snippets_expand_or_jump(cur_text, col)"{{{
|
||||
let cur_word = s:get_cursor_keyword_snippet(
|
||||
\ neocomplcache#sources#snippets_complete#get_snippets(),
|
||||
\ 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 != ''
|
||||
" Found snippet trigger.
|
||||
call neocomplcache#sources#snippets_complete#expand(
|
||||
|
@ -116,10 +116,8 @@ KEY MAPPINGS *neocomplcache-snippets-complete-key-mappings*
|
||||
Expand a cursor snippet of plural lines. When there is not a
|
||||
snippet, jump to next placeholder.
|
||||
|
||||
Note: cursor snippet must be match keyword patterns.
|
||||
For example if snippet name is ".", snippets_complete don't expand it.
|
||||
If you expand snippet ".", Please use
|
||||
|<Plug>(neocomplcache_snippets_force_expand)|.
|
||||
Note: It searches cursor snippet from keyword patterns in the
|
||||
first.
|
||||
|
||||
<Plug>(neocomplcache_snippets_jump) *<Plug>(neocomplcache_snippets_jump)*
|
||||
Jump to next placeholder. If there is no placeholder, expand a
|
||||
@ -312,6 +310,9 @@ CHANGELOG *neocomplcache-snippets-complete-changelog*
|
||||
2012-09-06
|
||||
- Added neocomplcache__convertable attribute.
|
||||
|
||||
2012-08-30
|
||||
- Changed <Plug>(neocomplcache_snippets_expand) behavior.
|
||||
|
||||
2012-08-27
|
||||
- Fixed neocomplcache#sources#snippets_complete#force_expandable().
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user