]> 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 pull request #22 from martinolsen/patch-1
authorBen Williams <benw@plasticboy.com>
Tue, 27 Mar 2012 14:57:14 +0000 (07:57 -0700)
committerBen Williams <benw@plasticboy.com>
Tue, 27 Mar 2012 14:57:14 +0000 (07:57 -0700)
allow link escape

1  2 
syntax/mkd.vim

diff --combined syntax/mkd.vim
index 51f891b18dabf17656098317e2445a859792fcc9,5232e028ac0ac7130cf82d94ffdc366c1707bc8d..4a7577ff777327536b2cdbc55cc12c928b8e7cb0
@@@ -42,7 -42,7 +42,7 @@@ 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
+ 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
@@@ -70,7 -70,6 +70,7 @@@ syn match  mkdCode      /^\s*\n\(\(\s\{
  syn match  mkdLineBreak /  \+$/
  syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
  syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
 +syn region mkdCode      start=/^```\w*\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>"