X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/71e5a946fd616a7526a3192db98ddb4484b1926a..3fc9d87883af15ec39af2449a79a9062d9bc41f0:/syntax/markdown.vim

diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 8c3d75c..ed348cb 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -42,31 +42,22 @@ if has('conceal')
 endif
 
 "additions to HTML groups
-"syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs\*\ze\_W" keepend
-"syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend
-"syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend
-"syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
-"syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
-"syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
-
-" emphasis stops at newline (in case a closing token is not found before)
-"if get(g:, "vim_markdown_emphasis_stops_at_newline", 1)
-"    let esanl_pre = '\(\n\|'
-"    let esanl_suf = '\)'
-"else
-"    let esanl_pre = ''
-"    let esanl_suf = ''
-"endif
-"execute 'syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs' . esanl_pre . '\*' . esanl_suf . '\ze\_W" keepend'
-"execute 'syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs' . esanl_pre . '_' . esanl_suf . '\ze\_W" keepend'
-"execute 'syn region htmlBold start="\*\*\ze\S" end="\S\zs' . esanl_pre . '\*\*' . esanl_suf . '" keepend'
-"execute 'syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
-"execute 'syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
-"execute 'syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
-
-" single-line emphasis (emphasis only works with matching token in the same line)
-syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\([^\n]*[^\\\*\t ]\)\?\*" end="[^\\\*\t ]\zs\*\ze\_W" keepend
-
+if get(g:, "vim_markdown_emphasis_multiline", 1)
+    syn region htmlItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]" end="[^\\\*\t ]\zs\*\ze\_W" keepend
+    syn region htmlItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend
+    syn region htmlBold start="\*\*\ze\S" end="\S\zs\*\*" keepend
+    syn region htmlBold start="__\ze\S" end="\S\zs__" keepend
+    syn region htmlBoldItalic start="\*\*\*\ze\S" end="\S\zs\*\*\*" keepend
+    syn region htmlBoldItalic start="___\ze\S" end="\S\zs___" keepend
+else
+    " single-line emphasis (emphasis only works with closing token on the same line)
+    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)
 syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"