mirror of
https://github.com/mattn/emmet-vim.git
synced 2025-12-06 18:54:27 +08:00
lang/charset should be in variables of configuration
This commit is contained in:
@@ -390,8 +390,8 @@ function! emmet#getDollarValueByKey(key)
|
|||||||
let V = get(ftsetting, key)
|
let V = get(ftsetting, key)
|
||||||
if type(V) == 1 | return V | endif
|
if type(V) == 1 | return V | endif
|
||||||
endif
|
endif
|
||||||
if type(ret) != 1 && has_key(s:emmet_settings, key)
|
if type(ret) != 1 && has_key(s:emmet_settings.variables, key)
|
||||||
let V = get(s:emmet_settings, key)
|
let V = get(s:emmet_settings.variables, key)
|
||||||
if type(V) == 1 | return V | endif
|
if type(V) == 1 | return V | endif
|
||||||
endif
|
endif
|
||||||
if has_key(s:emmet_settings, 'custom_expands') && type(s:emmet_settings['custom_expands']) == 4
|
if has_key(s:emmet_settings, 'custom_expands') && type(s:emmet_settings['custom_expands']) == 4
|
||||||
@@ -910,8 +910,13 @@ endfunction
|
|||||||
|
|
||||||
unlet! s:emmet_settings
|
unlet! s:emmet_settings
|
||||||
let s:emmet_settings = {
|
let s:emmet_settings = {
|
||||||
\ 'lang': "en",
|
\ 'variables': {
|
||||||
\ 'charset': "UTF-8",
|
\ 'lang': "en",
|
||||||
|
\ 'locale': "en-US",
|
||||||
|
\ 'charset': "UTF-8",
|
||||||
|
\ 'indentation': "\t",
|
||||||
|
\ 'newline': "\n",
|
||||||
|
\ },
|
||||||
\ 'custom_expands' : {
|
\ 'custom_expands' : {
|
||||||
\ '^\%(lorem\|lipsum\)\(\d*\)$' : function('emmet#lorem#en#expand'),
|
\ '^\%(lorem\|lipsum\)\(\d*\)$' : function('emmet#lorem#en#expand'),
|
||||||
\ },
|
\ },
|
||||||
|
|||||||
Reference in New Issue
Block a user