aboutsummaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-10-29 23:58:13 +0100
committerJustin M. Keyes <justinkz@gmail.com>2018-10-30 00:02:22 +0100
commit17c26d0dcfcc189cc020464ace67cc0a6f2475bd (patch)
treebdb6e2b8d0dcd484cfbfc2ae29521ba26fa9852f /runtime/syntax
parent7d2fbb9012e983ac013b6352b4cf8ea7a3a2f2b4 (diff)
downloadrneovim-17c26d0dcfcc189cc020464ace67cc0a6f2475bd.tar.gz
rneovim-17c26d0dcfcc189cc020464ace67cc0a6f2475bd.tar.bz2
rneovim-17c26d0dcfcc189cc020464ace67cc0a6f2475bd.zip
vim-patch:95bafa296ae9
Update runtime files. https://github.com/vim/vim/commit/95bafa296ae97bf420d5c74dd6db517b404c5df7
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/c.vim6
-rw-r--r--runtime/syntax/dosini.vim18
2 files changed, 14 insertions, 10 deletions
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 1143ca7dd7..95d3455dde 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2017 Apr 30
+" Last Change: 2018 Sep 21
" Quit when a (custom) syntax file was already loaded
if exists("b:current_syntax")
@@ -220,7 +220,7 @@ if exists("c_comment_strings")
syn match cCommentSkip contained "^\s*\*\($\|\s\+\)"
syn region cCommentString contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=cSpecial,cCommentSkip
syn region cComment2String contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=cSpecial
- syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cComment2String,cCharacter,cNumbersCom,cSpaceError,@Spell
+ syn region cCommentL start="//" skip="\\$" end="$" keepend contains=@cCommentGroup,cComment2String,cCharacter,cNumbersCom,cSpaceError,cWrongComTail,@Spell
if exists("c_no_comment_fold")
" Use "extend" here to have preprocessor lines not terminate halfway a
" comment.
@@ -239,6 +239,7 @@ endif
" keep a // comment separately, it terminates a preproc. conditional
syn match cCommentError display "\*/"
syn match cCommentStartError display "/\*"me=e-1 contained
+syn match cWrongComTail display "\*/"
syn keyword cOperator sizeof
if exists("c_gnu")
@@ -453,6 +454,7 @@ hi def link cErrInBracket cError
hi def link cCommentError cError
hi def link cCommentStartError cError
hi def link cSpaceError cError
+hi def link cWrongComTail cError
hi def link cSpecialError cError
hi def link cCurlyError cError
hi def link cOperator Operator
diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
index ccc5e86f1b..cf42819bcd 100644
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -1,12 +1,12 @@
" Vim syntax file
" Language: Configuration File (ini file) for MSDOS/MS Windows
-" Version: 2.1
+" Version: 2.2
" Original Author: Sean M. McKee <mckee@misslink.net>
" Previous Maintainer: Nima Talebi <nima@it.net.au>
-" Current Maintainer: Hong Xu <xuhdev@gmail.com>
+" Current Maintainer: Hong Xu <hong@topbug.net>
" Homepage: http://www.vim.org/scripts/script.php?script_id=3747
-" https://bitbucket.org/xuhdev/syntax-dosini.vim
-" Last Change: 2011 Nov 8
+" Repository: https://github.com/xuhdev/syntax-dosini.vim
+" Last Change: 2018 Sep 11
" quit when a syntax file was already loaded
@@ -17,10 +17,11 @@ endif
" shut case off
syn case ignore
-syn match dosiniNumber "\<\d\+\>"
-syn match dosiniNumber "\<\d*\.\d\+\>"
-syn match dosiniNumber "\<\d\+e[+-]\=\d\+\>"
-syn match dosiniLabel "^.\{-}="
+syn match dosiniLabel "^.\{-}\ze\s*=" nextgroup=dosiniNumber,dosiniValue
+syn match dosiniValue "=\zs.*"
+syn match dosiniNumber "=\zs\s*\d\+\s*$"
+syn match dosiniNumber "=\zs\s*\d*\.\d\+\s*$"
+syn match dosiniNumber "=\zs\s*\d\+e[+-]\=\d\+\s*$"
syn region dosiniHeader start="^\s*\[" end="\]"
syn match dosiniComment "^[#;].*$"
@@ -31,6 +32,7 @@ hi def link dosiniNumber Number
hi def link dosiniHeader Special
hi def link dosiniComment Comment
hi def link dosiniLabel Type
+hi def link dosiniValue String
let b:current_syntax = "dosini"