Cherry-pick the changes from dev -- part3

2018-02-16 18:11:49 +01:00
parent 7d4254a75d
commit 73bda6b9ab
9 changed files with 85 additions and 27 deletions
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -155,6 +155,8 @@ function! s:set_windowlocal_options()
  elseif foldmethod ==? 'syntax'
    setlocal foldmethod=syntax
    setlocal foldtext=VimwikiFoldText()
+  elseif foldmethod ==? 'custom'
+    " do nothing
  else
    setlocal foldmethod=manual
    normal! zE