Undo noremap, add header map tests

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

diff --git a/after/ftplugin/mkd.vim b/after/ftplugin/mkd.vim
index f04ae2bec4e8e9b3bb407ac53d948317ade502b0..24ee7131dcc0ae354d55a7f7cf5be9ed998c70f5 100644 (file)
--- a/after/ftplugin/mkd.vim
+++ b/after/ftplugin/mkd.vim
@@ -7,8 +7,8 @@
 " original version from Steve Losh's gist: https://gist.github.com/1038710
 
 func! Foldexpr_markdown(lnum)
 " original version from Steve Losh's gist: https://gist.github.com/1038710
 
 func! Foldexpr_markdown(lnum)

-    if (a:lnum == 0)
-        let l0 = getline(a:lnum)
+    if (a:lnum == 1)
+        let l0 = ''

     else
         let l0 = getline(a:lnum-1)
     endif
     else
         let l0 = getline(a:lnum-1)
     endif


@@ -29,23 +29,20 @@ func! Foldexpr_markdown(lnum)
     elseif l0 =~ '^#'
         " current line starts with hashes
         return '>'.matchend(l0, '^#\+')
     elseif l0 =~ '^#'
         " current line starts with hashes
         return '>'.matchend(l0, '^#\+')

-    elseif a:lnum == 1
-        " fold any 'preamble'
-        return '>1'

     else
         " keep previous foldlevel
         return '='
     endif
 endfunc
 
     else
         " keep previous foldlevel
         return '='
     endif
 endfunc
 

-setlocal foldexpr=Foldexpr_markdown(v:lnum)
-setlocal foldmethod=expr

 
 

-"---------- everything after this is optional -----------------------
-" change the following fold options to your liking
-" see ':help fold-options' for more
-setlocal foldenable
-setlocal foldlevel=0
-setlocal foldcolumn=0
-set foldmethod=expr
-set foldopen-=search
+if !get(g:, "vim_markdown_folding_disabled", 0)
+  setlocal foldexpr=Foldexpr_markdown(v:lnum)
+  setlocal foldmethod=expr
+
+  " allow the initial foldlevel to be configured in .vimrc
+  if !exists("g:vim_markdown_initial_foldlevel")
+    let g:vim_markdown_initial_foldlevel=0
+  endif
+  let &l:foldlevel=g:vim_markdown_initial_foldlevel
+endif