From: Jens Hoepken Date: Tue, 19 Mar 2013 12:58:38 +0000 (+0100) Subject: Resolve merge conflict X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/26cfc8ef05385a8b5f526c4d461d982a82b119b2?hp=3309ad4d293d2431008d7ec56faadfdcf334d5b9 Resolve merge conflict --- diff --git a/syntax/mkd.vim b/syntax/mkd.vim index ce01867..20b1d3a 100644 --- a/syntax/mkd.vim +++ b/syntax/mkd.vim @@ -69,6 +69,7 @@ syn region mkdCode start=/\s*``[^`]*/ end=/[^`]*``\s*/ syn region mkdCode start=/^```\s*\w*\s*$/ end=/^```\s*$/ syn region mkdCode start="]*>" end="" syn region mkdCode start="]*>" end="" +syn region mkdFootnote start="\[^" end="\]" syn match mkdCode /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ syn match mkdListItem "^\s*[-*+]\s\+" syn match mkdListItem "^\s*\d\+\.\s\+" @@ -91,6 +92,7 @@ syn match htmlH2 /^.\+\n-\+$/ contains=@Spell "highlighting for Markdown groups HtmlHiLink mkdString String HtmlHiLink mkdCode String +HtmlHiLink mkdFootnote Comment HtmlHiLink mkdBlockquote Comment HtmlHiLink mkdLineContinue Comment HtmlHiLink mkdListItem Identifier