diff options
| -rw-r--r-- | after/syntax/html.vim | 9 | ||||
| -rw-r--r-- | ftdetect/glsl.vim | 1 | ||||
| -rw-r--r-- | indent/glsl.vim | 1 | ||||
| -rw-r--r-- | syntax/glsl.vim | 7 |
4 files changed, 13 insertions, 5 deletions
diff --git a/after/syntax/html.vim b/after/syntax/html.vim new file mode 100644 index 0000000..667b27a --- /dev/null +++ b/after/syntax/html.vim @@ -0,0 +1,9 @@ +" Language: OpenGL Shading Language +" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io> + +syn include @GLSL syntax/glsl.vim +syn region ShaderScript + \ start="<script [^>]*type=\('\|\"\)x-shader/x-\(vertex\|fragment\)\('\|\"\)[^>]*>" + \ keepend + \ end="</script>"me=s-1 + \ contains=@GLSL,htmlScriptTag,@htmlPreproc diff --git a/ftdetect/glsl.vim b/ftdetect/glsl.vim index af8fb02..a37d16a 100644 --- a/ftdetect/glsl.vim +++ b/ftdetect/glsl.vim @@ -1,4 +1,3 @@ -" Vim syntax file " Language: OpenGL Shading Language " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io> diff --git a/indent/glsl.vim b/indent/glsl.vim index 6f363ac..a3cba2b 100644 --- a/indent/glsl.vim +++ b/indent/glsl.vim @@ -1,4 +1,3 @@ -" Vim syntax file " Language: OpenGL Shading Language " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io> diff --git a/syntax/glsl.vim b/syntax/glsl.vim index 92aeb9c..2b9a0df 100644 --- a/syntax/glsl.vim +++ b/syntax/glsl.vim @@ -1,8 +1,7 @@ -" Vim syntax file " Language: OpenGL Shading Language " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io> -if exists("b:current_syntax") +if exists("b:current_syntax") && b:current_syntax == "glsl" finish endif @@ -258,6 +257,8 @@ hi def link glslBuiltinFunction Function hi def link glslBuiltinVariable Identifier hi def link glslSwizzle SpecialChar -let b:current_syntax = "glsl" +if !exists("b:current_syntax") + let b:current_syntax = "glsl" +endif " vim:set sts=2 sw=2 : |