From: Ben Williams <benw@plasticboy.com>
Date: Mon, 21 Feb 2011 15:47:41 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/cgraeser/vim-markdown
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/3c2de6634dee38d4e4085b709442a2dff213c1ea?ds=sidebyside;hp=-c

Merge branch 'master' of git://github.com/cgraeser/vim-markdown
---

3c2de6634dee38d4e4085b709442a2dff213c1ea
diff --combined mkd.vim
index b5b9700,189c721..c6ea381
--- 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>)
@@@ -84,6 -81,27 +84,27 @@@ syn region htmlH6       start="^\s*####
  syn match  htmlH1       /^.\+\n=\+$/ contains=@Spell
  syn match  htmlH2       /^.\+\n-\+$/ contains=@Spell
  
+ 
+ 
+ " fold region for headings
+ syn region mkdHeaderFold
+     \ start="^\s*\z(#\+\)"
+     \ skip="^\s*\z1#\+"
+     \ end="^\(\s*#\)\@="
+     \ fold contains=TOP
+ 
+ " fold region for lists
+ syn region mkdListFold
+     \ start="^\z(\s*\)\*\z(\s*\)"
+     \ skip="^\z1 \z2\s*[^#]"
+     \ end="^\(.\)\@="
+     \ fold contains=TOP
+ 
+ syn sync fromstart
+ setlocal foldmethod=syntax
+ 
+ 
+ 
  "highlighting for Markdown groups
  HtmlHiLink mkdString	    String
  HtmlHiLink mkdCode          String
@@@ -94,7 -112,6 +115,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