diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-06-25 18:50:27 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-06-25 18:50:27 +0200 |
| commit | 946e27ab65d6f5d25c449a1bf6aedd808149601f (patch) | |
| tree | c89760ff953e00b9ff6f273fcaee9ba38dce4b70 /runtime/ftplugin | |
| parent | b6da44ae82f93d036ffb2ba37a009119688d9971 (diff) | |
| download | vim-946e27ab65d6f5d25c449a1bf6aedd808149601f.zip | |
Updated runtime files.
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/html.vim | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/runtime/ftplugin/html.vim b/runtime/ftplugin/html.vim index 418da06a6..7579080ea 100644 --- a/runtime/ftplugin/html.vim +++ b/runtime/ftplugin/html.vim @@ -20,49 +20,9 @@ if exists("g:ft_html_autocomment") && (g:ft_html_autocomment == 1) setlocal formatoptions-=t formatoptions+=croql endif - if exists('&omnifunc') - " Distinguish between HTML versions - " To use with other HTML versions add another - " elseif condition to match proper DOCTYPE - setlocal omnifunc=htmlcomplete#CompleteTags - - if &filetype == 'xhtml' - let b:html_omni_flavor = 'xhtml10s' - else - let b:html_omni_flavor = 'html401t' - endif - let i = 1 - let line = "" - while i < 10 && i < line("$") - let line = getline(i) - if line =~ '<!DOCTYPE.*\<DTD ' - break - endif - let i += 1 - endwhile - if line =~ '<!DOCTYPE.*\<DTD ' " doctype line found above - if line =~ ' HTML 3\.2' - let b:html_omni_flavor = 'html32' - elseif line =~ ' XHTML 1\.1' - let b:html_omni_flavor = 'xhtml11' - else " two-step detection with strict/frameset/transitional - if line =~ ' XHTML 1\.0' - let b:html_omni_flavor = 'xhtml10' - elseif line =~ ' HTML 4\.01' - let b:html_omni_flavor = 'html401' - elseif line =~ ' HTML 4.0\>' - let b:html_omni_flavor = 'html40' - endif - if line =~ '\<Transitional\>' - let b:html_omni_flavor .= 't' - elseif line =~ '\<Frameset\>' - let b:html_omni_flavor .= 'f' - else - let b:html_omni_flavor .= 's' - endif - endif - endif + setlocal omnifunc=htmlcomplete#CompleteTags + call htmlcomplete#DetectOmniFlavor() endif " HTML: thanks to Johannes Zellner and Benji Fisher. |