From: Ben Williams <bwilliams@gryphonnetworks.com>
Date: Tue, 1 Oct 2013 13:30:17 +0000 (-0400)
Subject: Merge branch 'list_items' of https://github.com/shirosaki/vim-markdown into shirosaki... 
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/bb1bd0a2f2a0634c8635ee146ad378bc68364191?hp=-c

Merge branch 'list_items' of https://github.com/shirosaki/vim-markdown into shirosaki-list_items
---

bb1bd0a2f2a0634c8635ee146ad378bc68364191
diff --combined syntax/mkd.vim
index 4515801,8ace27c..575466b
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@@ -70,9 -70,11 +70,11 @@@ syn region mkdCode         start=/^```\
  syn region mkdCode         start="<pre[^>]*>"              end="</pre>"
  syn region mkdCode         start="<code[^>]*>"             end="</code>"
  syn region mkdFootnote     start="\[^"                     end="\]"
- syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+ syn match  mkdCode         /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/
+ syn match  mkdIndentCode   /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained
  syn match  mkdListItem     "^\s*[-*+]\s\+"
  syn match  mkdListItem     "^\s*\d\+\.\s\+"
+ syn region mkdNonListItemBlock start="\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem
  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}_$/
@@@ -89,9 -91,12 +91,12 @@@ syn region htmlH6       start="^\s*####
  syn match  htmlH1       /^.\+\n=\+$/ contains=@Spell
  syn match  htmlH2       /^.\+\n-\+$/ contains=@Spell
  
+ syn cluster mkdNonListItem contains=htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdID,mkdURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdIndentCode,mkdListItem,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6
+ 
  "highlighting for Markdown groups
  HtmlHiLink mkdString	    String
  HtmlHiLink mkdCode          String
+ HtmlHiLink mkdIndentCode    String
  HtmlHiLink mkdFootnote    Comment
  HtmlHiLink mkdBlockquote    Comment
  HtmlHiLink mkdLineContinue  Comment
@@@ -109,11 -114,6 +114,11 @@@ HtmlHiLink mkdLinkTitle     htmlStrin
  
  HtmlHiLink mkdDelimiter     Delimiter
  
 +" Automatically insert bullets
 +setlocal formatoptions+=r
 +" Accept various markers as bullets
 +setlocal comments=b:*,b:+,b:-
 +
  let b:current_syntax = "mkd"
  
  delcommand HtmlHiLink