From d6ab310cc9aa7c5e6434577aab5fdde90e96ff31 Mon Sep 17 00:00:00 2001 From: mattn Date: Tue, 26 Nov 2013 09:58:41 +0900 Subject: [PATCH] Fixes rendering type --- autoload/emmet.vim | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 703d724..cc512e1 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -1,7 +1,7 @@ "============================================================================= " emmet.vim " Author: Yasuhiro Matsumoto -" Last Change: 29-Oct-2013. +" Last Change: 26-Nov-2013. let s:save_cpo = &cpo set cpo&vim @@ -254,7 +254,6 @@ function! emmet#toString(...) endif let inner = '' if len(current.child) - let render_type = emmet#getFileType(1) for n in current.child let inner .= emmet#toString(n, type, inline, filters, s:itemno(group_itemno, n), indent) endfor @@ -279,6 +278,9 @@ function! emmet#getFilters(type) endfunction function! emmet#getResource(type, name, default) + if exists('b:emmet_' . a:name) + return get(b:, 'emmet_' . a:name) + endif if !has_key(s:emmet_settings, a:type) return a:default endif @@ -478,7 +480,7 @@ function! emmet#expandAbbr(mode, abbr) range endif let items = emmet#parseIntoTree(query, type).child for item in items - let expand .= emmet#toString(item, type, 0, filters, 0, indent) + let expand .= emmet#toString(item, rtype, 0, filters, 0, indent) endfor if emmet#useFilter(filters, 'e') let expand = substitute(expand, '&', '\&', 'g') @@ -533,7 +535,7 @@ function! emmet#expandAbbr(mode, abbr) range let items = emmet#parseIntoTree(leader . "{".str."}", type).child endif for item in items - let expand .= emmet#toString(item, type, 0, filters, 0, '') + let expand .= emmet#toString(item, rtype, 0, filters, 0, '') endfor if emmet#useFilter(filters, 'e') let expand = substitute(expand, '&', '\&', 'g')