Merge pull request #257 from alexconst/fix/url_regex

[etc/vim.git] / ftplugin / markdown.vim

diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index d68e7c0a790aeeca9e1f55e574d05976bc363aaf..2f0c19fdd5db27943e27422af9f6f83c1931a154 100644 (file)
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -617,7 +617,8 @@ command! -buffer Toct call s:Toc('tab')
 let s:filetype_dict = {
     \ 'c++': 'cpp',
     \ 'viml': 'vim',
-    \ 'bash': 'sh'
+    \ 'bash': 'sh',
+    \ 'ini': 'dosini'
 \ }
 
 function! s:MarkdownHighlightSources(force)
@@ -631,6 +632,10 @@ function! s:MarkdownHighlightSources(force)
     if !exists('b:mkd_known_filetypes')
         let b:mkd_known_filetypes = {}
     endif
+    if !exists('b:mkd_included_filetypes')
+        " set syntax file name included
+        let b:mkd_included_filetypes = {}
+    endif
     if !a:force && (b:mkd_known_filetypes == filetypes || empty(filetypes))
         return
     endif
@@ -646,7 +651,12 @@ function! s:MarkdownHighlightSources(force)
                 let filetype = ft
             endif
             let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g"))
-            let include = s:SyntaxInclude(filetype)
+            if !has_key(b:mkd_included_filetypes, filetype)
+                let include = s:SyntaxInclude(filetype)
+                let b:mkd_included_filetypes[filetype] = 1
+            else
+                let include = '@' . toupper(filetype)
+            endif
             let command = 'syntax region %s matchgroup=%s start="^\s*```%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s'
             execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') ? ' concealends' : '')
             execute printf('syntax cluster mkdNonListItem add=%s', group)