X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/8b591b760f4c2024197356c6832aeeaf6ab3a44a..94f85d78fd274a69694de26836b2fd0e7806e240:/after/ftplugin/markdown.vim

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index f16d875..cdf0a26 100644
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -114,7 +114,7 @@ else
             return '>1'
         elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
             " next line is underlined (level 2)
-            if g:vim_markdown_folding_level >= 2
+            if s:vim_markdown_folding_level >= 2
                 return '>1'
             else
                 return '>2'
@@ -124,8 +124,7 @@ else
         let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " fold level according to option
-            let l:level = matchend(l1, '^#\+')
-            if g:vim_markdown_folding_level == 1 || l:level > g:vim_markdown_folding_level
+            if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level
                 return -1
             else
                 " headers are not folded
@@ -137,7 +136,7 @@ else
             " current line starts with hashes
             return '>'.matchend(l0, '^#\+')
         else
-            " fold here because of setext headers
+            " keep previous foldlevel
             return '='
         endif
     endfunction
@@ -146,12 +145,12 @@ endif
 
 let b:fenced_block = 0
 let b:front_matter = 0
-let g:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
+let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
 
 if !get(g:, "vim_markdown_folding_disabled", 0)
     setlocal foldexpr=Foldexpr_markdown(v:lnum)
     setlocal foldmethod=expr
-    if get(g:, "vim_markdown_folding_style_pythonic", 0)
+    if get(g:, "vim_markdown_folding_style_pythonic", 0) && get(g:, "vim_markdown_override_foldtext", 1)
         setlocal foldtext=Foldtext_markdown()
     endif
 endif