Merge pull request #231 from wilywampa/master

Escape ampersand in mirror text
This commit is contained in:
Shougo 2014-05-13 19:48:51 +09:00
commit 3ad458d235

View File

@ -435,7 +435,7 @@ function! s:substitute_placeholder_marker(start, end, snippet_holder_cnt) "{{{
if getline(line) =~ sync_marker if getline(line) =~ sync_marker
let sub = escape(matchstr(getline(line), let sub = escape(matchstr(getline(line),
\ substitute(neosnippet#get_sync_placeholder_marker_default_pattern(), \ substitute(neosnippet#get_sync_placeholder_marker_default_pattern(),
\ '\\d\\+', cnt, '')), '/\') \ '\\d\\+', cnt, '')), '/\&')
silent execute printf('%d,%ds/\m' . mirror_marker . '/%s/' silent execute printf('%d,%ds/\m' . mirror_marker . '/%s/'
\ . (&gdefault ? '' : 'g'), a:start, a:end, sub) \ . (&gdefault ? '' : 'g'), a:start, a:end, sub)
call setline(line, substitute(getline(line), sync_marker, sub, '')) call setline(line, substitute(getline(line), sync_marker, sub, ''))