Merge pull request #297 from KainokiKaede/master

Fix the matching region of mkdListItem.

diff --git a/.travis.yml b/.travis.yml
index a913cd75324b06f201d3a5b8afb8d34ec2c3b8bc..ab79fcd41a5aebd1777fe99a5a81fa434aac78d4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script: |
     export PATH="/usr/local/bin:$PATH"
     cd "$TRAVIS_BUILD_DIR"
   fi
-  sudo pip install virtualenv
+  sudo -H pip install virtualenv
   stty cols 80
 
 script:

diff --git a/README.md b/README.md
index 9c6665ef2aeb88d74e125a360cb4662444b99adb..f5cbaf9aa4c1bf0988a6b694da3024bf458aef67 100644 (file)
--- a/README.md
+++ b/README.md
@@ -81,6 +81,12 @@ let g:vim_markdown_folding_style_pythonic = 1
 Level 1 heading which is served as a document title is not folded.
 `g:vim_markdown_folding_level` setting is not active with this fold style.
 
+To prevent foldtext from being set add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_override_foldtext = 0
+```
+
 ### Set header folding level
 
 Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.

diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 6265db3a7b5a466dfe6a4813b1e2adb9f4d2835d..cdf0a2654a40c037287d0cf3f57ff6d34d7902fb 100644 (file)
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -150,7 +150,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_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

diff --git a/doc/vim-markdown.txt b/doc/vim-markdown.txt
index eb616539a98a1e533877eee9177872238de8fcd9..339fdaff1b499e73746c132ab883b13d424d4314 100644 (file)
--- a/doc/vim-markdown.txt
+++ b/doc/vim-markdown.txt
@@ -96,6 +96,10 @@ To fold in a style like python-mode [6], add the following to your '.vimrc':
 Level 1 heading which is served as a document title is not folded.
 'g:vim_markdown_folding_level' setting is not active with this fold style.
 
+To prevent foldtext from being overridden, add the following to your '.vimrc':
+
+  let g:vim_markdown_override_foldtext = 0
+
 -------------------------------------------------------------------------------
                                         *vim-markdown-set-header-folding-level*
 Set header folding level ~