]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'list_items' of https://github.com/shirosaki/vim-markdown into shirosaki...
authorBen Williams <bwilliams@gryphonnetworks.com>
Tue, 1 Oct 2013 13:30:17 +0000 (09:30 -0400)
committerBen Williams <bwilliams@gryphonnetworks.com>
Tue, 1 Oct 2013 13:30:17 +0000 (09:30 -0400)
1  2 
syntax/mkd.vim

diff --combined syntax/mkd.vim
index 45158016ac6b10ea32dcae4d1f211d647ada053e,8ace27c33dab4ccfac1b31d0ccbafc851568a0c7..575466be58fee41f64e46203fd369881ab97e457
@@@ -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