Merge pull request #131 from bjpbakker/master

Respect global fold config

diff --git a/README.md b/README.md
index 2b23477a9ba029c54e9bdde8e4c8506a4beaa594..9583a4385b1e4ada0e140c26f6e3e3d239f303d6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -39,12 +39,18 @@ If you are not using any package manager, download the [tarball](https://github.
 
 ### Disable Folding
 
-Add the following line to your `.vimrc` to disable folding.
+Add the following line to your `.vimrc` to disable folding configuration.
 
 ```vim
 let g:vim_markdown_folding_disabled=1
 ```
 
+This option only controls vim_markdown's folding configuration. To enable/disable folding use Vim's folding configuration.
+
+```vim
+set [no]foldenable
+```
+
 ### Set Initial Foldlevel
 
 Add the following line to your `.vimrc` to set the initial foldlevel. This option defaults to 0 (i.e. all folds are closed) and is ignored if folding is disabled.

diff --git a/after/ftplugin/mkd.vim b/after/ftplugin/mkd.vim
index 6026ae8b05204cd695557b5077ed7601e6dcafa3..24ee7131dcc0ae354d55a7f7cf5be9ed998c70f5 100644 (file)
--- a/after/ftplugin/mkd.vim
+++ b/after/ftplugin/mkd.vim
@@ -45,12 +45,4 @@ if !get(g:, "vim_markdown_folding_disabled", 0)
     let g:vim_markdown_initial_foldlevel=0
   endif
   let &l:foldlevel=g:vim_markdown_initial_foldlevel
-
-  "---------- everything after this is optional -----------------------
-  " change the following fold options to your liking
-  " see ':help fold-options' for more
-  setlocal foldenable
-  setlocal foldcolumn=0
-  set foldmethod=expr
-  set foldopen-=search
 endif