Search global variables more accurately

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

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index f16d875f4127f596abf75dc4aa1ddf2a061ca8f8..41dfd944e971a2c20ee44eea1e467b689df35457 100644 (file)
--- 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)
             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'
                 return '>1'
             else
                 return '>2'


@@ -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 g:vim_markdown_folding_level == 1 || l:level > g: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,10 +137,10 @@ 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
             return '>'.matchend(l0, '^#\+')
         else

-            " fold here because of setext headers
+            " keep previous foldlevel

             return '='
         endif
     endfunction
             return '='
         endif
     endfunction


@@ -146,12 +149,22 @@ endif
 
 let b:fenced_block = 0
 let b:front_matter = 0
 
 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)
-        setlocal foldtext=Foldtext_markdown()
-    endif
-endif
+function! s:MarkdownSetupFolding()
+  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) && get(g:, "vim_markdown_override_foldtext", 1)
+          setlocal foldtext=Foldtext_markdown()
+      endif
+  endif
+endfunction
+call s:MarkdownSetupFolding()
+augroup Mkd
+    " These autocmds need to be kept in sync with the autocmds calling
+    " s:MarkdownRefreshSyntax in ftplugin/markdown.vim.
+    autocmd BufWinEnter,BufWritePost <buffer> call s:MarkdownSetupFolding()
+    autocmd InsertEnter,InsertLeave <buffer> call s:MarkdownSetupFolding()
+    autocmd CursorHold,CursorHoldI <buffer> call s:MarkdownSetupFolding()
+augroup END