diff options
Diffstat (limited to 'autoload')
| -rw-r--r-- | autoload/go/complete.vim | 2 | ||||
| -rw-r--r-- | autoload/htmlcomplete.vim | 34 | ||||
| -rw-r--r-- | autoload/xml/html5.vim | 2 |
3 files changed, 20 insertions, 18 deletions
diff --git a/autoload/go/complete.vim b/autoload/go/complete.vim index 8dd43de4..a4fa6b66 100644 --- a/autoload/go/complete.vim +++ b/autoload/go/complete.vim @@ -58,7 +58,7 @@ function! go#complete#Package(ArgLead, CmdLine, CursorPos) if executable('go') let goroot = substitute(system('go env GOROOT'), '\n', '', 'g') if v:shell_error - echomsg '\'go env GOROOT\' failed' + echomsg '''go env GOROOT'' failed' endif else let goroot = $GOROOT diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim index 6da9be24..8b4492e4 100644 --- a/autoload/htmlcomplete.vim +++ b/autoload/htmlcomplete.vim @@ -7,9 +7,11 @@ " Last Change: 2010 Sep 25 if !exists('g:aria_attributes_complete') - let g:aria_attributes_complete = 1 + let g:aria_attributes_complete = 1 endif +let b:html_omni_flavor = 'html5' + function! htmlcomplete#CompleteTags(findstart, base) if a:findstart " locate the start of the word @@ -167,11 +169,11 @@ function! htmlcomplete#CompleteTags(findstart, base) "runtime! autoload/xml/xhtml10s.vim call htmlcomplete#LoadData() endif - if g:aria_attributes_complete == 1 && !exists("b:aria_omni") - call htmlcomplete#LoadAria() - endif + if g:aria_attributes_complete == 1 && !exists("b:aria_omni") + call htmlcomplete#LoadAria() + endif - let entities = b:html_omni['vimxmlentities'] + let entities = b:html_omni['vimxmlentities'] if len(a:base) == 1 for m in entities @@ -469,9 +471,9 @@ function! htmlcomplete#CompleteTags(findstart, base) "runtime! autoload/xml/xhtml10s.vim call htmlcomplete#LoadData() endif - if g:aria_attributes_complete == 1 && !exists("b:aria_omni") - call htmlcomplete#LoadAria() - endif + if g:aria_attributes_complete == 1 && !exists("b:aria_omni") + call htmlcomplete#LoadAria() + endif " }}} if attrname == 'href' " Now we are looking for local anchors defined by name or id @@ -551,9 +553,9 @@ function! htmlcomplete#CompleteTags(findstart, base) if !exists("b:html_omni") call htmlcomplete#LoadData() endif - if g:aria_attributes_complete == 1 && !exists("b:aria_omni") - call htmlcomplete#LoadAria() - endif + if g:aria_attributes_complete == 1 && !exists("b:aria_omni") + call htmlcomplete#LoadAria() + endif " }}} if has_key(b:html_omni, tag) @@ -658,9 +660,9 @@ function! htmlcomplete#CompleteTags(findstart, base) "runtime! autoload/xml/xhtml10s.vim call htmlcomplete#LoadData() endif - if g:aria_attributes_complete == 1 && !exists("b:aria_omni") - call htmlcomplete#LoadAria() - endif + if g:aria_attributes_complete == 1 && !exists("b:aria_omni") + call htmlcomplete#LoadAria() + endif " }}} " Tag completion {{{ " Deal with tag completion. @@ -763,9 +765,9 @@ endfunction function! htmlcomplete#LoadData() " {{{ if !exists("b:html_omni_flavor") if &filetype == 'html' - let b:html_omni_flavor = 'html401t' + let b:html_omni_flavor = 'html5' else - let b:html_omni_flavor = 'xhtml10s' + let b:html_omni_flavor = 'html5' endif endif " With that if we still have bloated memory but create new buffer diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim index 0452ba49..01a1c742 100644 --- a/autoload/xml/html5.vim +++ b/autoload/xml/html5.vim @@ -342,7 +342,7 @@ let abutton_dec = 'details\\|embed\\|iframe\\|keygen\\|label\\|menu\\|select\\|t let g:xmldata_html5 = { \ 'vimxmlentities': ['AElig', 'Aacute', 'Acirc', 'Agrave', 'Alpha', 'Aring', 'Atilde', 'Auml', 'Beta', 'Ccedil', 'Chi', 'Dagger', 'Delta', 'ETH', 'Eacute', 'Ecirc', 'Egrave', 'Epsilon', 'Eta', 'Euml', 'Gamma', 'Iacute', 'Icirc', 'Igrave', 'Iota', 'Iuml', 'Kappa', 'Lambda', 'Mu', 'Ntilde', 'Nu', 'OElig', 'Oacute', 'Ocirc', 'Ograve', 'Omega', 'Omicron', 'Oslash', 'Otilde', 'Ouml', 'Phi', 'Pi', 'Prime', 'Psi', 'Rho', 'Scaron', 'Sigma', 'THORN', 'Tau', 'Theta', 'Uacute', 'Ucirc', 'Ugrave', 'Upsilon', 'Uuml', 'Xi', 'Yacute', 'Yuml', 'Zeta', 'aacute', 'acirc', 'acute', 'aelig', 'agrave', 'alefsym', 'alpha', 'amp', 'and', 'ang', 'apos', 'aring', 'asymp', 'atilde', 'auml', 'bdquo', 'beta', 'brvbar', 'bull', 'cap', 'ccedil', 'cedil', 'cent', 'chi', 'circ', 'clubs', 'cong', 'copy', 'crarr', 'cup', 'curren', 'dArr', 'dagger', 'darr', 'deg', 'delta', 'diams', 'divide', 'eacute', 'ecirc', 'egrave', 'empty', 'emsp', 'ensp', 'epsilon', 'equiv', 'eta', 'eth', 'euml', 'euro', 'exist', 'fnof', 'forall', 'frac12', 'frac14', 'frac34', 'frasl', 'gamma', 'ge', 'gt', 'hArr', 'harr', 'hearts', 'hellip', 'iacute', 'icirc', 'iexcl', 'igrave', 'image', 'infin', 'int', 'iota', 'iquest', 'isin', 'iuml', 'kappa', 'lArr', 'lambda', 'lang', 'laquo', 'larr', 'lceil', 'ldquo', 'le', 'lfloor', 'lowast', 'loz', 'lrm', 'lsaquo', 'lsquo', 'lt', 'macr', 'mdash', 'micro', 'middot', 'minus', 'mu', 'nabla', 'nbsp', 'ndash', 'ne', 'ni', 'not', 'notin', 'nsub', 'ntilde', 'nu', 'oacute', 'ocirc', 'oelig', 'ograve', 'oline', 'omega', 'omicron', 'oplus', 'or', 'ordf', 'ordm', 'oslash', 'otilde', 'otimes', 'ouml', 'para', 'part', 'permil', 'perp', 'phi', 'pi', 'piv', 'plusmn', 'pound', 'prime', 'prod', 'prop', 'psi', 'quot', 'rArr', 'radic', 'rang', 'raquo', 'rarr', 'rceil', 'rdquo', 'real', 'reg', 'rfloor', 'rho', 'rlm', 'rsaquo', 'rsquo', 'sbquo', 'scaron', 'sdot', 'sect', 'shy', 'sigma', 'sigmaf', 'sim', 'spades', 'sub', 'sube', 'sum', 'sup', 'sup1', 'sup2', 'sup3', 'supe', 'szlig', 'tau', 'there4', 'theta', 'thetasym', 'thinsp', 'thorn', 'tilde', 'times', 'trade', 'uArr', 'uacute', 'uarr', 'ucirc', 'ugrave', 'uml', 'upsih', 'upsilon', 'uuml', 'weierp', 'xi', 'yacute', 'yen', 'yuml', 'zeta', 'zwj', 'zwnj'], -\ 'vimxmlroot': ['html'], +\ 'vimxmlroot': ['html', 'head', 'body'] + flow_elements, \ 'a': [ \ filter(copy(flow_elements), "!(v:val =~ '". abutton_dec ."')"), \ extend(copy(global_attributes), {'name': [], 'href': [], 'target': [], 'rel': linktypes, 'hreflang': lang_tag, 'media': [], 'type': []}) |