From: Jens Hoepken <jhoepken@gmail.com>
Date: Tue, 19 Mar 2013 12:58:38 +0000 (+0100)
Subject: Resolve merge conflict
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/26cfc8ef05385a8b5f526c4d461d982a82b119b2?ds=sidebyside;hp=-c

Resolve merge conflict
---

26cfc8ef05385a8b5f526c4d461d982a82b119b2
diff --combined syntax/mkd.vim
index eda1acf,ce01867..20b1d3a
--- a/syntax/mkd.vim
+++ b/syntax/mkd.vim
@@@ -36,15 -36,18 +36,18 @@@ syn case ignor
  syn sync linebreaks=1
  
  "additions to HTML groups
- syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!/     end=/\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/   contains=@Spell,htmlItalic
- syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!/       end=/\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/      contains=htmlBold,@Spell
- syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=_\@<!___\@!/         end=/\\\@<!_\@<!___\@!\($\|\A\)\@=/       contains=htmlItalic,@Spell
- syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/          end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/        contains=htmlBold,@Spell
+ syn region htmlItalic start="\\\@<!\*\S\@=" end="\S\@<=\\\@<!\*" keepend oneline
+ syn region htmlItalic start="\(^\|\s\)\@<=_\|\\\@<!_\([^_]\+\s\)\@=" end="\S\@<=_\|_\S\@=" keepend oneline
+ syn region htmlBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend oneline
+ syn region htmlBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend oneline
+ syn region htmlBoldItalic start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend oneline
+ syn region htmlBoldItalic start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend oneline
  
  " [link](URL) | [link][id] | [link][]
- 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
+ syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
+ syn region mkdID matchgroup=mkdDelimiter        start="\["    end="\]" contained oneline
+ syn region mkdURL matchgroup=mkdDelimiter       start="("     end=")"  contained oneline
+ syn region mkdLink matchgroup=mkdDelimiter      start="\\\@<!\[" end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite oneline
  " 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*/
@@@ -59,21 -62,21 +62,22 @@@ syn region mkdLinkTitle matchgroup=mkdD
  
  "define Markdown groups
  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*-\{3,}$/
- syn match  mkdRule      /^\s*\*\{3,5}$/
- syn match  mkdListItem  "^\s*[-*+]\s\+"
- syn match  mkdListItem  "^\s*\d\+\.\s\+"
- syn match  mkdCode      /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
- syn match  mkdLineBreak /  \+$/
- syn region mkdFootnote  start="\[^"      end="\]"
- syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
- syn region mkdCode      start=/\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>"
+ syn match  mkdLineBreak    /  \+$/
+ syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLineBreak,mkdLineContinue,@Spell
+ syn region mkdCode         start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/\(\([^\\]\|^\)\\\)\@<!`/
+ syn region mkdCode         start=/\s*``[^`]*/              end=/[^`]*``\s*/
+ syn region mkdCode         start=/^```\s*\w*\s*$/          end=/^```\s*$/
+ 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  mkdListItem     "^\s*[-*+]\s\+"
+ syn match  mkdListItem     "^\s*\d\+\.\s\+"
+ 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}$/
  
  "HTML headings
  syn region htmlH1       start="^\s*#"                   end="\($\|#\+\)" contains=@Spell
@@@ -85,36 -88,15 +89,16 @@@ 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
 +HtmlHiLink mkdFootnote    Comment
  HtmlHiLink mkdBlockquote    Comment
  HtmlHiLink mkdLineContinue  Comment
  HtmlHiLink mkdListItem      Identifier
  HtmlHiLink mkdRule          Identifier
  HtmlHiLink mkdLineBreak     Todo
+ HtmlHiLink mkdFootnotes     htmlLink
  HtmlHiLink mkdLink          htmlLink
  HtmlHiLink mkdURL           htmlString
  HtmlHiLink mkdInlineURL     htmlLink