diff options
| -rw-r--r-- | LICENSE | 21 | ||||
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | ftdetect/glsl.vim | 2 | ||||
| -rw-r--r-- | syntax/glsl.vim | 5 |
4 files changed, 33 insertions, 5 deletions
@@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 Sergey Tikhomirov + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..a7e4411 --- /dev/null +++ b/README.md @@ -0,0 +1,10 @@ +# vim-glsl + +Vim syntax highlighting for OpenGL Shading Language + +## Installation + +Using pathogen: + + $ cd ~/.vim/bundle + $ git clone https://github.com/tikhomirov/vim-glsl diff --git a/ftdetect/glsl.vim b/ftdetect/glsl.vim index 152df17..31ca24c 100644 --- a/ftdetect/glsl.vim +++ b/ftdetect/glsl.vim @@ -3,6 +3,6 @@ " Maintainer: Sergey Tikhomirov <me@stikhomirov.com> " Last Change: 2012 July 10 -autocmd BufNewFile,BufRead *.glsl,*.geom,*.vert,*.frag set filetype=glsl +autocmd BufNewFile,BufRead *.glsl,*.geom,*.vert,*.frag,*.gsh,*.vsh,*.fsh set filetype=glsl " vim:set sw=2: diff --git a/syntax/glsl.vim b/syntax/glsl.vim index ace8d36..6eed124 100644 --- a/syntax/glsl.vim +++ b/syntax/glsl.vim @@ -246,10 +246,7 @@ hi def link glslTokenConcat glslPreProc hi def link glslPredefinedMacro Macro hi def link glslPreProc PreProc hi def link glslBoolean Boolean -hi def link glslDecimalInt glslNumber -hi def link glslOctalInt glslNumber -hi def link glslHexInt glslNumber -hi def link glslNumber Number +hi def link glslInteger Number hi def link glslFloat Float hi def link glslStructure Structure hi def link glslType Type |