From: Ciro Santilli 六四事件 法轮功 包卓轩 Date: Tue, 19 Jan 2016 12:39:18 +0000 (-0500) Subject: Merge pull request #245 from cirosantilli/contributing-headers X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/ae7229f00484cfa06e41891152b5350ebedb7f3b?hp=da8a4756efb2b2d9140f610c95dcf3adc1bdb9ba Merge pull request #245 from cirosantilli/contributing-headers Make contributing headers h2 like README --- diff --git a/README.md b/README.md index ec200b6..0328b7f 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,6 @@ Highlight YAML frontmatter as used by Jekyll: let g:vim_markdown_frontmatter = 1 ``` - ## Mappings The following work on normal and visual modes: diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim index c43b0bd..1ce35a8 100644 --- a/ftplugin/markdown.vim +++ b/ftplugin/markdown.vim @@ -609,7 +609,7 @@ let s:filetype_dict = { \ 'viml': 'vim' \ } -function! s:Markdown_highlight_sources(force) +function! s:MarkdownHighlightSources(force) " Syntax highlight source code embedded in notes. " Look for code blocks in the current file let filetypes = {} @@ -635,7 +635,7 @@ function! s:Markdown_highlight_sources(force) let filetype = ft endif let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g")) - let include = s:syntax_include(filetype) + let include = s:SyntaxInclude(filetype) 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) @@ -645,7 +645,7 @@ function! s:Markdown_highlight_sources(force) endfor endfunction -function! s:syntax_include(filetype) +function! s:SyntaxInclude(filetype) " Include the syntax highlighting of another {filetype}. let grouplistname = '@' . toupper(a:filetype) " Unset the name of the current syntax while including the other syntax @@ -670,16 +670,16 @@ function! s:syntax_include(filetype) endfunction -function! s:Markdown_refresh_syntax(force) +function! s:MarkdownRefreshSyntax(force) if &filetype == 'markdown' && line('$') > 1 - call s:Markdown_highlight_sources(a:force) + call s:MarkdownHighlightSources(a:force) endif endfunction augroup Mkd autocmd! - au BufWinEnter * call s:Markdown_refresh_syntax(1) - au BufWritePost * call s:Markdown_refresh_syntax(0) - au InsertEnter,InsertLeave * call s:Markdown_refresh_syntax(0) - au CursorHold,CursorHoldI * call s:Markdown_refresh_syntax(0) + au BufWinEnter * call s:MarkdownRefreshSyntax(1) + au BufWritePost * call s:MarkdownRefreshSyntax(0) + au InsertEnter,InsertLeave * call s:MarkdownRefreshSyntax(0) + au CursorHold,CursorHoldI * call s:MarkdownRefreshSyntax(0) augroup END diff --git a/test/syntax.vader b/test/syntax.vader index bdc599f..e63ce7e 100644 --- a/test/syntax.vader +++ b/test/syntax.vader @@ -268,7 +268,7 @@ end ``` Execute (fenced code block syntax with a language specifier): - let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_refresh_syntax') + let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax') call b:func(0) AssertEqual SyntaxOf('include'), 'cInclude' AssertEqual SyntaxOf('code'), 'mkdSnippetCPP' @@ -280,7 +280,7 @@ code ``` Execute (fenced code block syntax with an unknown language specifier): - let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_refresh_syntax') + let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax') call b:func(0) AssertEqual SyntaxOf('code'), 'mkdSnippetA_B_'