From: Alexandre Constantino Date: Thu, 4 Feb 2016 11:52:48 +0000 (+0000) Subject: Fix single-line emphasis dealing with escapes X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/3fc9d87883af15ec39af2449a79a9062d9bc41f0?ds=sidebyside Fix single-line emphasis dealing with escapes Reverted back to greedy emphasis --- diff --git a/syntax/markdown.vim b/syntax/markdown.vim index 994de6b..ed348cb 100644 --- a/syntax/markdown.vim +++ b/syntax/markdown.vim @@ -51,13 +51,12 @@ if get(g:, "vim_markdown_emphasis_multiline", 1) syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend else " single-line emphasis (emphasis only works with closing token on the same line) - " the following character makes the match non-greedy: vv - syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\([^\n\*]*[^\\\*\t ]\)\?\*" end="[^\\\*\t ]\zs\*\ze\_W" keepend - syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]\([^\n_]*[^\\_\t ]\)\?_" end="[^\\_\t ]\zs_\ze\_W" keepend - syn region htmlBold start="\*\*\ze\S\([^\n\*]*[^\\\*\t ]\)\?\*\*" end="\S\zs\*\*" keepend - syn region htmlBold start="__\ze\S\([^\n_]*[^\\_\t ]\)\?__" end="\S\zs__" keepend - syn region htmlBold start="\*\*\*\ze\S\([^\n\*]*[^\\\*\t ]\)\?\*\*\*" end="\S\zs\*\*\*" keepend - syn region htmlBold start="___\ze\S\([^\n_]*[^\\_\t ]\)\?___" end="\S\zs___" keepend + syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\([^\n]*[^\\\*\t ]\)\?\*" end="[^\\\*\t ]\zs\*\ze\_W" keepend + syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]\([^\n]*[^\\_\t ]\)\?_" end="[^\\_\t ]\zs_\ze\_W" keepend + syn region htmlBold start="\*\*\ze\S\([^\n]*[^\\\*\t ]\)\?\*\*" end="\S\zs\*\*" keepend + syn region htmlBold start="__\ze\S\([^\n]*[^\\_\t ]\)\?__" end="\S\zs__" keepend + syn region htmlBold start="\*\*\*\ze\S\([^\n]*[^\\\*\t ]\)\?\*\*\*" end="\S\zs\*\*\*" keepend + syn region htmlBold start="___\ze\S\([^\n]*[^\\_\t ]\)\?___" end="\S\zs___" keepend endif " [link](URL) | [link][id] | [link][] | ![image](URL)