From 1c240c6d6d1fb2ed67b3f42146d498541bcf3bd1 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 20 Aug 2015 00:20:53 +0900 Subject: [PATCH] extendible configuration with '*' --- autoload/emmet.vim | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/autoload/emmet.vim b/autoload/emmet.vim index 559e43c..57caef9 100644 --- a/autoload/emmet.vim +++ b/autoload/emmet.vim @@ -290,6 +290,10 @@ function! emmet#getResource(type, name, default) abort if exists('b:emmet_' . a:name) return get(b:, 'emmet_' . a:name) endif + let global = {} + if has_key(s:emmet_settings, '*') && has_key(s:emmet_settings['*'], a:name) + let global = extend(global, s:emmet_settings['*'][a:name]) + endif for type in split(a:type, '\.') if !has_key(s:emmet_settings, type) @@ -323,11 +327,18 @@ function! emmet#getResource(type, name, default) abort endif endif if !empty(ret) + if type(ret) ==# 3 || type(ret) ==# 4 + let ret = extend(global, ret) + endif return ret endif endfor - return a:default + let ret = a:default + if type(ret) ==# 3 || type(ret) ==# 4 + let ret = extend(global, ret) + endif + return ret endfunction function! emmet#getFileType(...) abort @@ -1928,7 +1939,7 @@ let s:emmet_settings = { \ ."\t\n" \ ."\n" \ } -\ } +\ }, \} if exists('g:user_emmet_settings')