From: Ben Williams <bwilliams@gryphonnetworks.com>
Date: Thu, 15 Nov 2012 20:33:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'remotes/FarMcKon/master'
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/3299dc841b1bc21d4ecb02b17886790f578e951e?hp=a5ce3746dd54732a58ea1f29ca174084250045e4

Merge remote-tracking branch 'remotes/FarMcKon/master'
---

diff --git a/syntax/mkd.vim b/syntax/mkd.vim
index ad41589..8f3fd86 100644
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@ -42,6 +42,7 @@ syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=_\@<!___\@!/         end=/\\\@<
 syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/          end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/        contains=htmlBold,@Spell
 
 " [link](URL) | [link][id] | [link][]
+syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
 syn region mkdLink matchgroup=mkdDelimiter      start="[^\\]\!\?\[" end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite
 syn region mkdID matchgroup=mkdDelimiter        start="\["    end="\]" contained
 syn region mkdURL matchgroup=mkdDelimiter       start="("     end=")"  contained
@@ -70,7 +71,7 @@ syn match  mkdCode      /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
 syn match  mkdLineBreak /  \+$/
 syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
 syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
-syn region mkdCode      start=/^```\w*\s*$/          end=/^```\s*$/
+syn region mkdCode      start=/^```\s*\w*\s*$/          end=/^```\s*$/
 syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineBreak,mkdLineContinue,@Spell
 syn region mkdCode      start="<pre[^>]*>"         end="</pre>"
 syn region mkdCode      start="<code[^>]*>"        end="</code>"
@@ -114,6 +115,7 @@ HtmlHiLink mkdLineContinue  Comment
 HtmlHiLink mkdListItem      Identifier
 HtmlHiLink mkdRule          Identifier
 HtmlHiLink mkdLineBreak     Todo
+HtmlHiLink mkdFootnotes     htmlLink
 HtmlHiLink mkdLink          htmlLink
 HtmlHiLink mkdURL           htmlString
 HtmlHiLink mkdInlineURL     htmlLink