From: Ciro Santilli Date: Wed, 5 Feb 2014 23:43:47 +0000 (+0100) Subject: Merge pull request #60 from cirosantilli/contributing-guidelines X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/bb8aeb1fcf3fa51193fefee1546ee25bfa454e4a?hp=886ba1b89a55ec6495f9a4c10206aa950e712211 Merge pull request #60 from cirosantilli/contributing-guidelines Added contributing guidelines and started tests as required by them --- diff --git a/syntax/mkd.vim b/syntax/mkd.vim index 575466b..82778c2 100644 --- a/syntax/mkd.vim +++ b/syntax/mkd.vim @@ -15,7 +15,10 @@ if version < 600 so :p:h/html.vim else runtime! syntax/html.vim - unlet b:current_syntax + + if exists('b:current_syntax') + unlet b:current_syntax + endif endif if version < 600 @@ -66,7 +69,7 @@ syn match mkdLineBreak / \+$/ syn region mkdBlockquote start=/^\s*>/ end=/$/ contains=mkdLineBreak,mkdLineContinue,@Spell syn region mkdCode start=/\(\([^\\]\|^\)\\\)\@]*>" end="" syn region mkdCode start="]*>" end="" syn region mkdFootnote start="\[^" end="\]" @@ -74,7 +77,7 @@ syn match mkdCode /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/ syn match mkdIndentCode /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained syn match mkdListItem "^\s*[-*+]\s\+" syn match mkdListItem "^\s*\d\+\.\s\+" -syn region mkdNonListItemBlock start="\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem +syn region mkdNonListItemBlock start="\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem,@Spell syn match mkdRule /^\s*\*\s\{0,1}\*\s\{0,1}\*$/ syn match mkdRule /^\s*-\s\{0,1}-\s\{0,1}-$/ syn match mkdRule /^\s*_\s\{0,1}_\s\{0,1}_$/