Merge pull request #422 from tobinjt/testing-fix

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

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 5c51126339a4da40c964fae9400759630e3ecc8f..9ee01006960b118c1a82ddec0958b047496e54db 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -124,9 +124,12 @@ else
         let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " fold level according to option
         let l1 = getline(a:lnum)
         if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
             " fold level according to option

-            let l:level = matchend(l1, '^#\+')
-            if s:vim_markdown_folding_level == 1 || l:level > s:vim_markdown_folding_level
-                return -1
+            if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level
+                if a:lnum == line('$')
+                    return matchend(l1, '^#\+') - 1
+                else
+                    return -1
+                endif

             else
                 " headers are not folded
                 return 0
             else
                 " headers are not folded
                 return 0


@@ -134,7 +137,7 @@ else
         endif
 
         if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)
         endif
 
         if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)

-            " current line starts with hashes
+            " previous line starts with hashes

             return '>'.matchend(l0, '^#\+')
         else
             " keep previous foldlevel
             return '>'.matchend(l0, '^#\+')
         else
             " keep previous foldlevel


@@ -151,7 +154,7 @@ 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_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
         setlocal foldtext=Foldtext_markdown()
     endif
 endif