From 1a096f0901264629947afb89436019895e5e7ef5 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Wed, 9 Jun 2021 16:54:25 +0200 Subject: Fix script indentation inside html, closes #693 --- ftplugin/html.vim | 56 +++++++------------------------------------------------ 1 file changed, 7 insertions(+), 49 deletions(-) (limited to 'ftplugin') 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(':p'), 'html', 'ftplugin/html.vim') +if polyglot#init#is_disabled(expand(':p'), 'html5', 'ftplugin/html.vim') finish endif -" Vim filetype plugin file -" Language: html -" Maintainer: Dan Sharp -" Last Changed: 20 Jan 2009 -" URL: http://dwsharp.users.sourceforge.net/vim/ftplugin +" Maintainer: othree +" 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= -setlocal comments=s: - -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 -- cgit v1.2.3