Merge branch 'master' of git://github.com/mattn/emmet-vim

This commit is contained in:
Yasuhiro Matsumoto
2016-10-29 20:34:36 +09:00
2 changed files with 3 additions and 1 deletions

View File

@@ -446,6 +446,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
let q = emmet#getResource(type, 'quote_char', '"')
let ct = emmet#getResource(type, 'comment_type', 'both')
let an = emmet#getResource(type, 'attribute_name', {})
let empty_element_suffix = emmet#getResource(type, 'empty_element_suffix', settings.html.empty_element_suffix)
if emmet#useFilter(filters, 'haml')
return emmet#lang#haml#toString(settings, current, type, inline, filters, itemno, indent)
@@ -569,7 +570,7 @@ function! emmet#lang#html#toString(settings, current, type, inline, filters, ite
if current.empty
let str .= ' />'
elseif stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1
let str .= settings.html.empty_element_suffix
let str .= empty_element_suffix
else
let str .= '>'
let text = current.value[1:-2]