summaryrefslogtreecommitdiffstats
path: root/syntax/html
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2019-09-06 15:54:31 +0200
commit48e07bc5014fecfdff24f75124a65634c216c9e2 (patch)
tree2e16f9a515364e27ac451acbc313b1d7ca518790 /syntax/html
parentc8897c9c18ee79d3780dd352aee34bf6498c625d (diff)
downloadvim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.tar.gz
vim-polyglot-48e07bc5014fecfdff24f75124a65634c216c9e2.zip
Improve guard to support concatenated files
Diffstat (limited to '')
-rw-r--r--syntax/html.vim10
-rw-r--r--syntax/html/aria.vim6
-rw-r--r--syntax/html/electron.vim6
-rw-r--r--syntax/html/rdfa.vim6
4 files changed, 9 insertions, 19 deletions
diff --git a/syntax/html.vim b/syntax/html.vim
index a529b56b..61dacaa5 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
" Vim syntax file
" Language: HTML (version 5.1)
" SVG (SVG 1.1 Second Edition)
@@ -192,10 +189,8 @@ syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemul
syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jinja') != -1
- finish
endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
" Vim syntax file
" Language: HTML (version 5)
" Maintainer: Rodrigo Machado <rcmachado@gmail.com>
@@ -286,3 +281,4 @@ syn match htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
" Relationship Attributes
syn match htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
syn match htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
+endif
diff --git a/syntax/html/aria.vim b/syntax/html/aria.vim
index 78106c17..a22c013b 100644
--- a/syntax/html/aria.vim
+++ b/syntax/html/aria.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
" Vim syntax file
" Language: WAI-ARIA
" Maintainer: othree <othree@gmail.com>
@@ -77,3 +74,4 @@ syn match htmlArg contained "\<aria-\%(\|labelledby\|owns\|posinset\|setsize\
syn match htmlArg contained "\<aria-\%(\|colcount\|colindex\|colspan\)\>"
syn match htmlArg contained "\<aria-\%(\|rowcount\|rowindex\|rowspan\)\>"
+endif
diff --git a/syntax/html/electron.vim b/syntax/html/electron.vim
index 64ed9e9b..090c0648 100644
--- a/syntax/html/electron.vim
+++ b/syntax/html/electron.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
" Vim syntax file
" Language: Electron
" Maintainer: othree <othree@gmail.com>
@@ -17,3 +14,4 @@ syn keyword htmlArg contained useragent disablewebsecurity partition allowpopups
syn keyword htmlArg contained webpreferences blinkfeatures disableblinkfeatures
syn keyword htmlArg contained guestinstance disableguestresize
+endif
diff --git a/syntax/html/rdfa.vim b/syntax/html/rdfa.vim
index 4f32e783..dfe9f9b6 100644
--- a/syntax/html/rdfa.vim
+++ b/syntax/html/rdfa.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
- finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
" Vim syntax file
" Language: RDFa
" Maintainer: othree <othree@gmail.com>
@@ -13,3 +10,4 @@ endif
" RDFa
" http://www.w3.org/TR/rdfa-syntax/#s_syntax
syn keyword htmlArg contained about content datatype href inlist prefix property rel resource rev src typeof vocab
+endif