Merge commit '6bc305a910399423e5c9'

This commit is contained in:
mattn
2010-05-24 10:00:08 +09:00

View File

@@ -862,9 +862,6 @@ function! s:zen_use_filter(filters, filter)
return 1
endif
endfor
if a:filter == 'html'
return 1
endif
return 0
endfunction
@@ -1295,8 +1292,16 @@ function! s:zen_toString(...)
let str .= s:zen_toString_html(s:zen_settings, current, type, inline, filters, itemno, indent)
endif
else
if len(current.snippet) > 0
let tmp = substitute(current.snippet, '|', '${cursor}', 'g')
let snippet = current.snippet
if len(current.snippet) <= 0
let snippets = s:zen_getResource(type, 'snippets', {})
if !empty(snippets) && has_key(snippets, 'zensnippet')
let snippet = snippets['zensnippet']
endif
endif
if len(snippet) > 0
let tmp = substitute(snippet, '|', '${cursor}', 'g')
let tmp = substitute(tmp, '\${zenname}', current.name, 'g')
if type == 'css' && s:zen_use_filter(filters, 'fc')
let tmp = substitute(tmp, '^\([^:]\+\):\(.*\)$', '\1: \2', '')
endif