summaryrefslogtreecommitdiffstats
path: root/ftplugin
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2021-06-09 16:54:25 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2021-06-09 16:54:25 +0200
commit1a096f0901264629947afb89436019895e5e7ef5 (patch)
tree0091c11164ad40da302e53faa0987e31e6ab9d62 /ftplugin
parent4dd1f8f2be6a9d10d13a594e1d81af8de1d0270a (diff)
downloadvim-polyglot-1a096f0901264629947afb89436019895e5e7ef5.tar.gz
vim-polyglot-1a096f0901264629947afb89436019895e5e7ef5.zip
Fix script indentation inside html, closes #693
Diffstat (limited to 'ftplugin')
-rw-r--r--ftplugin/html.vim56
1 files changed, 7 insertions, 49 deletions
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 7664383b..6c260baa 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,55 +1,13 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'ftplugin/html.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'ftplugin/html.vim')
finish
endif
-" Vim filetype plugin file
-" Language: html
-" Maintainer: Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Changed: 20 Jan 2009
-" URL: http://dwsharp.users.sourceforge.net/vim/ftplugin
+" Maintainer: othree <othree@gmail.com>
+" URL: http://github.com/othree/html5.vim
+" Last Change: 2014-05-02
+" License: MIT
+" Changes: Add - to keyword
-if exists("b:did_ftplugin") | finish | endif
-let b:did_ftplugin = 1
+" setlocal iskeyword+=-
-" Make sure the continuation lines below do not cause problems in
-" compatibility mode.
-let s:save_cpo = &cpo
-set cpo-=C
-
-setlocal matchpairs+=<:>
setlocal commentstring=<!--%s-->
-setlocal comments=s:<!--,m:\ \ \ \ ,e:-->
-
-if exists("g:ft_html_autocomment") && (g:ft_html_autocomment == 1)
- setlocal formatoptions-=t formatoptions+=croql
-endif
-
-if exists('&omnifunc')
- setlocal omnifunc=htmlcomplete#CompleteTags
- call htmlcomplete#DetectOmniFlavor()
-endif
-
-" HTML: thanks to Johannes Zellner and Benji Fisher.
-if exists("loaded_matchit")
- let b:match_ignorecase = 1
- let b:match_words = '<:>,' .
- \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .
- \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .
- \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
-
-" Change the :browse e filter to primarily show HTML-related files.
-if has("gui_win32")
- let b:browsefilter="HTML Files (*.html,*.htm)\t*.htm;*.html\n" .
- \ "JavaScript Files (*.js)\t*.js\n" .
- \ "Cascading StyleSheets (*.css)\t*.css\n" .
- \ "All Files (*.*)\t*.*\n"
-endif
-
-" Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal commentstring< matchpairs< omnifunc< comments< formatoptions<" .
- \ " | unlet! b:match_ignorecase b:match_skip b:match_words b:browsefilter"
-
-" Restore the saved compatibility options.
-let &cpo = s:save_cpo
-unlet s:save_cpo