From: Ben Williams <benw@plasticboy.com>
Date: Mon, 21 Feb 2011 15:43:22 +0000 (-0500)
Subject: Merge branch 'multi-line-captions' of git://github.com/bsilverthorn/vim-markdown
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/ac8bc01256d732624db2821dc7a4c64605b4bf2a?ds=sidebyside;hp=-c

Merge branch 'multi-line-captions' of git://github.com/bsilverthorn/vim-markdown
---

ac8bc01256d732624db2821dc7a4c64605b4bf2a
diff --combined mkd.vim
index f5bf538,7968d0c..b5b9700
--- a/mkd.vim
+++ b/mkd.vim
@@@ -42,12 -42,9 +42,12 @@@ syn region htmlBold     start=/\\\@<!\(
  syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/          end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/        contains=htmlBold,@Spell
  
  " [link](URL) | [link][id] | [link][]
- syn region mkdLink matchgroup=mkdDelimiter      start="\!\?\[" end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite oneline
+ 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
 +" mkd  inline links:           protocol   optional  user:pass@       sub/domain                 .com, .co.uk, etc      optional port   path/querystring/hash fragment
 +"                            ------------ _____________________ --------------------------- ________________________ ----------------- __
 +syntax match   mkdInlineURL /https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*/
  
  " Link definitions: [id]: URL (Optional Title)
  " TODO handle automatic links without colliding with htmlTag (<URL>)
@@@ -94,7 -91,6 +94,7 @@@ HtmlHiLink mkdRule          Identifie
  HtmlHiLink mkdLineBreak     Todo
  HtmlHiLink mkdLink          htmlLink
  HtmlHiLink mkdURL           htmlString
 +HtmlHiLink mkdInlineURL     htmlLink
  HtmlHiLink mkdID            Identifier
  HtmlHiLink mkdLinkDef       mkdID
  HtmlHiLink mkdLinkDefTarget mkdURL