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?ds=sidebyside;hp=-c

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

3299dc841b1bc21d4ecb02b17886790f578e951e
diff --combined syntax/mkd.vim
index 8db5dbc,ad41589..8f3fd86
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@@ -42,7 -42,6 +42,7 @@@ syn region htmlBold     start=/\\\@<!\(
  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
@@@ -62,7 -61,7 +62,7 @@@ syn region mkdLinkTitle matchgroup=mkdD
  syn match  mkdLineContinue ".$" contained
  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}_$/
+ syn match  mkdRule      /^\s+_\s\{0,1}_\s\{0,1}_$/
  syn match  mkdRule      /^\s*-\{3,}$/
  syn match  mkdRule      /^\s*\*\{3,5}$/
  syn match  mkdListItem  "^\s*[-*+]\s\+"
@@@ -71,7 -70,7 +71,7 @@@ syn match  mkdCode      /^\s*\n\(\(\s\{
  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>"
@@@ -115,7 -114,6 +115,7 @@@ HtmlHiLink mkdLineContinue  Commen
  HtmlHiLink mkdListItem      Identifier
  HtmlHiLink mkdRule          Identifier
  HtmlHiLink mkdLineBreak     Todo
 +HtmlHiLink mkdFootnotes     htmlLink
  HtmlHiLink mkdLink          htmlLink
  HtmlHiLink mkdURL           htmlString
  HtmlHiLink mkdInlineURL     htmlLink