From 777569f95fba78408d2ee0cdddcd39e08b51d351 Mon Sep 17 00:00:00 2001
From: mMontu <mMontu@github>
Date: Tue, 12 Jul 2016 11:41:44 -0300
Subject: [PATCH 001/108] Workaround for slow folding methods (issue #225)

---
 doc/vimwiki.txt    |  2 ++
 plugin/vimwiki.vim | 14 +++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 9cc5dd9..7192574 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -2288,6 +2288,8 @@ Limitations:
   - 'list' is intended to work with lists nicely indented with 'shiftwidth'.
   - 'syntax' is only available for the default syntax so far.
 
+The options above can be suffixed with ':quick' (e.g.: 'expr:quick') in order
+to use some workarounds to make folds work faster.
 
 ------------------------------------------------------------------------------
 *g:vimwiki_list_ignore_newline*
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index d7abb6c..90fb166 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -156,15 +156,15 @@ function! s:setup_buffer_enter() "{{{
   " Settings foldmethod, foldexpr and foldtext are local to window. Thus in a
   " new tab with the same buffer folding is reset to vim defaults. So we
   " insist vimwiki folding here.
-  if g:vimwiki_folding ==? 'expr'
+  if g:vimwiki_folding =~? '^expr.*'
     setlocal fdm=expr
     setlocal foldexpr=VimwikiFoldLevel(v:lnum)
     setlocal foldtext=VimwikiFoldText()
-  elseif g:vimwiki_folding ==? 'list' || g:vimwiki_folding ==? 'lists'
+  elseif g:vimwiki_folding =~? '^list.*' || g:vimwiki_folding ==? '^lists.*'
     setlocal fdm=expr
     setlocal foldexpr=VimwikiFoldListLevel(v:lnum)
     setlocal foldtext=VimwikiFoldText()
-  elseif g:vimwiki_folding ==? 'syntax'
+  elseif g:vimwiki_folding =~? '^syntax.*'
     setlocal fdm=syntax
     setlocal foldtext=VimwikiFoldText()
   else
@@ -446,6 +446,14 @@ augroup vimwiki
       exe 'autocmd InsertLeave *'.s:ext.' call vimwiki#tbl#format(line("."))'
       exe 'autocmd InsertEnter *'.s:ext.' call vimwiki#tbl#reset_tw(line("."))'
     endif
+    if g:vimwiki_folding =~? ':quick$'
+      " from http://vim.wikia.com/wiki/Keep_folds_closed_while_inserting_text
+      " Don't screw up folds when inserting text that might affect them, until
+      " leaving insert mode. Foldmethod is local to the window. Protect against
+      " screwing up folding when switching between windows.
+      exe 'autocmd InsertEnter *'.s:ext.' if !exists("w:last_fdm") | let w:last_fdm=&foldmethod | setlocal foldmethod=manual | endif'
+      exe 'autocmd InsertLeave,WinLeave *'.s:ext.' if exists("w:last_fdm") | let &l:foldmethod=w:last_fdm | unlet w:last_fdm | endif'
+    endif
   endfor
 augroup END
 "}}}

From 6b34e954e8fd669e302e7ad5d679b8448dc128f1 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 21 Dec 2016 17:09:25 +0100
Subject: [PATCH 002/108] Add new functions for variable access

Ref #256
---
 autoload/vimwiki/vars.vim | 203 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 203 insertions(+)
 create mode 100644 autoload/vimwiki/vars.vim

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
new file mode 100644
index 0000000..f7ccdb8
--- /dev/null
+++ b/autoload/vimwiki/vars.vim
@@ -0,0 +1,203 @@
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
+" Vimwiki autoload plugin file
+" Desc: stuff concerning Vimwiki's state
+" Home: https://github.com/vimwiki/vimwiki/
+
+
+" copy the user's settings from variables of the form g:vimwiki_<option> into g:vimwiki_global_vars
+" (or set a default value)
+function! s:populate_global_variables()
+  let g:vimwiki_global_vars = {
+        \ 'CJK_length': 0,
+        \ 'auto_chdir': 0,
+        \ 'autowriteall': 1,
+        \ 'conceallevel': 2,
+        \ 'diary_months':
+              \ {
+              \ 1: 'January', 2: 'February', 3: 'March',
+              \ 4: 'April', 5: 'May', 6: 'June',
+              \ 7: 'July', 8: 'August', 9: 'September',
+              \ 10: 'October', 11: 'November', 12: 'December'
+              \ },
+        \ 'dir_link': '',
+        \ 'ext2syntax': {},
+        \ 'folding': '',
+        \ 'global_ext': 1,
+        \ 'hl_cb_checked': 0,
+        \ 'hl_headers': 0,
+        \ 'html_header_numbering': 0,
+        \ 'html_header_numbering_sym': '',
+        \ 'list_ignore_newline': 1,
+        \ 'listsyms': ' .oOX',
+        \ 'map_prefix': '<Leader>w',
+        \ 'menu': 'Vimwiki',
+        \ 'table_auto_fmt': 1,
+        \ 'table_mappings': 1,
+        \ 'toc_header': 'Contents',
+        \ 'url_maxsave': 15,
+        \ 'use_calendar': 1,
+        \ 'use_mouse': 0,
+        \ 'user_htmls': '',
+        \ 'valid_html_tags': 'b,i,s,u,sub,sup,kbd,br,hr,div,center,strong,em',
+        \ 'w32_dir_enc': '',
+        \ }
+
+  for key in keys(g:vimwiki_global_vars)
+    if exists('g:vimwiki_'.key)
+      let g:vimwiki_global_vars[key] = g:vimwiki_{key}
+    endif
+  endfor
+endfunction
+
+
+function! s:normalize_path(path) "{{{
+  " trim trailing / and \ because otherwise resolve() doesn't work quite right
+  let path = substitute(a:path, '[/\\]\+$', '', '')
+  if path !~# '^scp:'
+    return resolve(expand(path)).'/'
+  else
+    return path.'/'
+  endif
+endfunction "}}}
+
+
+" g:vimwiki_wikilocal_vars is a list of dictionaries. One dict for every registered wiki. The last
+" dictionary contains default values (used for temporary wikis)
+function! s:populate_wikilocal_options()
+  let default_values = {
+        \ 'auto_export': 0,
+        \ 'auto_tags': 0,
+        \ 'auto_toc': 0,
+        \ 'css_name': 'style.css',
+        \ 'custom_wiki2html': '',
+        \ 'diary_header': 'Diary',
+        \ 'diary_index': 'diary',
+        \ 'diary_link_fmt': '%Y-%m-%d',
+        \ 'diary_rel_path': 'diary/',
+        \ 'diary_sort': 'desc',
+        \ 'ext': '.wiki',
+        \ 'index': 'index',
+        \ 'list_margin': -1,
+        \ 'maxhi': 0,
+        \ 'nested_syntaxes': {},
+        \ 'path': '~/vimwiki/',
+        \ 'path_html': '',
+        \ 'syntax': 'default',
+        \ 'template_default': 'default',
+        \ 'template_ext': '.tpl',
+        \ 'template_path': '~/vimwiki/templates/',
+        \ }
+
+  let g:vimwiki_wikilocal_vars = []
+
+  if exists('g:vimwiki_list')
+    for users_options in g:vimwiki_list
+      let new_options_dict = {}
+      for key in keys(default_values)
+        if has_key(users_options, key)
+          let new_options_dict[key] = users_options[key]
+        elseif exists('g:vimwiki_'.key)
+          let new_options_dict[key] = g:vimwiki_{key}
+        else
+          let new_options_dict[key] = default_values[key]
+        endif
+      endfor
+      call add(g:vimwiki_wikilocal_vars, new_options_dict)
+    endfor
+  endif
+
+  " default values for temporary wikis
+  let temporary_options_dict = {}
+  for key in keys(default_values)
+    if exists('g:vimwiki_'.key)
+      let temporary_options_dict[key] = g:vimwiki_{key}
+    else
+      let temporary_options_dict[key] = default_values[key]
+    endif
+  endfor
+  call add(g:vimwiki_wikilocal_vars, default_values)
+
+  call s:validate_options()
+endfunction
+
+
+function! s:validate_options()
+  for options_dict in g:vimwiki_wikilocal_vars
+    let options_dict['path'] = s:normalize_path(options_dict['path'])
+
+    let path_html = options_dict['path_html']
+    if !empty(path_html)
+      let options_dict['path_html'] = s:normalize_path(path_html)
+    else
+      let options_dict['path_html'] = s:normalize_path(
+            \ substitute(options_dict['path'], '[/\\]\+$', '', '').'_html/')
+    endif
+
+    let options_dict['template_path'] =  s:normalize_path(options_dict['template_path'])
+    let options_dict['diary_rel_path'] =  s:normalize_path(options_dict['diary_rel_path'])
+  endfor
+endfunction
+
+
+" TODO
+function! s:populate_syntax_vars(syntax)
+  if !exists('g:vimwiki_syntax_variables')
+    let g:vimwiki_syntax_variables = {}
+  endif
+endfunction
+
+
+function! vimwiki#vars#init()
+  call s:populate_global_variables()
+  call s:populate_wikilocal_options()
+endfunction
+
+
+function! vimwiki#vars#get_syntaxlocal(syntax, key)
+  if !exists('g:vimwiki_syntax_variables') || !has_key(g:vimwiki_syntax_variables, a:syntax)
+    call s:populate_syntax_vars(a:syntax)
+  endif
+
+  return g:vimwiki_syntax_variables[a:syntax][a:key]
+endfunction
+
+
+" Get a variable for the buffer we are currently in.
+" Populate the variable, if it doesn't exist.
+function! vimwiki#vars#get_bufferlocal(key)
+  if exists('b:vimwiki_'.a:key)
+    return b:vimwiki_{a:key}
+  elseif a:key ==# 'wiki_nr'
+    let b:vimwiki_wiki_nr = vimwiki#base#find_wiki(expand('%:p'))
+    return b:vimwiki_wiki_nr
+  endif
+endfunction
+
+
+function! vimwiki#vars#set_buffer_var(key, value)
+  let b:vimwiki_{a:key} = a:value
+endfunction
+
+
+function! vimwiki#vars#get_global(key)
+  return g:vimwiki_global_vars[a:key]
+endfunction
+
+
+function! vimwiki#vars#get_wikilocal(wiki_nr, key)
+  return g:vimwiki_wikilocal_vars[a:wiki_nr][a:key]
+endfunction
+
+
+function! vimwiki#vars#set_wikilocal(wiki_nr, key, value)
+  if a:wiki_nr == len(g:vimwiki_wikilocal_vars) - 1
+    call insert(g:vimwiki_wikilocal_vars, {}, -1)
+  endif
+  let g:vimwiki_wikilocal_vars[a:wiki_nr][a:key] = a:value
+endfunction
+
+
+" number of registered wikis + temporary
+function! vimwiki#vars#number_of_wikis()
+  return len(g:vimwiki_wikilocal_vars) - 1
+endfunction

From e6d997867a20f676084b4a4bc2a023d8f4e8357c Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 21 Dec 2016 19:43:34 +0100
Subject: [PATCH 003/108] Use new access functions for global variables -- part
 1

Ref #256
---
 autoload/vimwiki/base.vim  | 19 +++++------
 autoload/vimwiki/diary.vim |  2 +-
 autoload/vimwiki/html.vim  |  6 ++--
 autoload/vimwiki/tbl.vim   |  2 +-
 ftplugin/vimwiki.vim       |  4 +--
 plugin/vimwiki.vim         | 64 +++++++++++++-------------------------
 syntax/vimwiki.vim         |  6 ++--
 7 files changed, 41 insertions(+), 62 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 748ccbd..53895bd 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -18,8 +18,8 @@ function! s:vimwiki_get_known_syntaxes() " {{{
       let syntaxes[wiki.syntax] = 1
     endif
   endfor
-  " append map g:vimwiki_ext2syntax
-  for syn in values(g:vimwiki_ext2syntax)
+  " also consider the syntaxes from g:vimwiki_ext2syntax
+  for syn in values(vimwiki#vars#get_global('ext2syntax'))
     let syntaxes[syn] = 1
   endfor
   return keys(syntaxes)
@@ -131,7 +131,7 @@ function! vimwiki#base#setup_buffer_state(idx) " {{{ Init page-specific variable
   call VimwikiSet('subdir', subdir, a:idx)
   call VimwikiSet('invsubdir', vimwiki#base#invsubdir(subdir), a:idx)
 
-  if g:vimwiki_auto_chdir == 1
+  if vimwiki#vars#get_global('auto_chdir') == 1
     exe 'lcd' VimwikiGet('path')
   endif
 
@@ -322,8 +322,8 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     let link_infos.filename = root_dir . link_text
 
     if vimwiki#path#is_link_to_dir(link_text)
-      if g:vimwiki_dir_link != ''
-        let link_infos.filename .= g:vimwiki_dir_link .
+      if vimwiki#vars#get_global('dir_link') != ''
+        let link_infos.filename .= vimwiki#vars#get_global('dir_link') .
               \ VimwikiGet('ext', link_infos.index)
       endif
     else
@@ -1745,6 +1745,7 @@ endfunction " }}}
 function! vimwiki#base#table_of_contents(create)
   " collect new headers
   let is_inside_pre_or_math = 0  " 1: inside pre, 2: inside math, 0: outside
+  let numbering = vimwiki#vars#get_global('html_header_numbering')
   let headers = []
   let headers_levels = [['', 0], ['', 0], ['', 0], ['', 0], ['', 0], ['', 0]]
   for lnum in range(1, line('$'))
@@ -1784,11 +1785,11 @@ function! vimwiki#base#table_of_contents(create)
     endfor
     let h_complete_id .= headers_levels[h_level-1][0]
 
-    if g:vimwiki_html_header_numbering > 0
-          \ && g:vimwiki_html_header_numbering <= h_level
+    if numbering > 0
+          \ && numbering <= h_level
       let h_number = join(map(copy(headers_levels[
-            \ g:vimwiki_html_header_numbering-1 : h_level-1]), 'v:val[1]'), '.')
-      let h_number .= g:vimwiki_html_header_numbering_sym
+            \ numbering-1 : h_level-1]), 'v:val[1]'), '.')
+      let h_number .= vimwiki#vars#get_global('html_header_numbering_sym')
       let h_text = h_number.' '.h_text
     endif
 
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 7d773e8..80b1fa7 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -55,7 +55,7 @@ function! s:get_position_links(link) "{{{
 endfunction "}}}
 
 fun! s:get_month_name(month) "{{{
-  return g:vimwiki_diary_months[str2nr(a:month)]
+  return vimwiki#vars#get_global('diary_months')[str2nr(a:month)]
 endfun "}}}
 
 " Helpers }}}
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 584985f..b4aeed6 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1023,11 +1023,11 @@ function! s:process_tag_h(line, id) "{{{
       let h_number .= a:id[h_level-1][1]
       let h_complete_id .= a:id[h_level-1][0]
 
-      if g:vimwiki_html_header_numbering
+      if vimwiki#vars#get_global('html_header_numbering')
         let num = matchstr(h_number,
-              \ '^\(\d.\)\{'.(g:vimwiki_html_header_numbering-1).'}\zs.*')
+              \ '^\(\d.\)\{'.(vimwiki#vars#get_global('html_header_numbering')-1).'}\zs.*')
         if !empty(num)
-          let num .= g:vimwiki_html_header_numbering_sym
+          let num .= vimwiki#vars#get_global('html_header_numbering_sym')
         endif
         let h_text = num.' '.h_text
       endif
diff --git a/autoload/vimwiki/tbl.vim b/autoload/vimwiki/tbl.vim
index b05d67c..05204fe 100644
--- a/autoload/vimwiki/tbl.vim
+++ b/autoload/vimwiki/tbl.vim
@@ -29,7 +29,7 @@ function! s:wide_len(str) "{{{
   endif
 
   " get str display width in vim ver < 7.2
-  if !g:vimwiki_CJK_length
+  if !vimwiki#vars#get_global('CJK_length')
     let ret = strlen(substitute(a:str, '.', 'x', 'g'))
   else
     let savemodified = &modified
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 1f96ec2..76e190a 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -22,8 +22,8 @@ let b:undo_ftplugin = "setlocal ".
 
 setlocal commentstring=%%%s
 
-if g:vimwiki_conceallevel && exists("+conceallevel")
-  let &l:conceallevel = g:vimwiki_conceallevel
+if vimwiki#vars#get_global('conceallevel') && exists("+conceallevel")
+  let &l:conceallevel = vimwiki#vars#get_global('conceallevel')
 endif
 
 " GOTO FILE: gf {{{
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index d7abb6c..d22fe45 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -75,7 +75,7 @@ function! s:setup_filetype() "{{{
   let path = expand('%:p:h')
   let idx = vimwiki#base#find_wiki(path)
 
-  if idx == -1 && g:vimwiki_global_ext == 0
+  if idx == -1 && vimwiki#vars#get_global('global_ext') == 0
     return
   endif
   "XXX when idx = -1? (an orphan page has been detected)
@@ -86,11 +86,7 @@ function! s:setup_filetype() "{{{
   if idx == -1
     let ext = '.'.expand('%:e')
     " lookup syntax using g:vimwiki_ext2syntax
-    if has_key(g:vimwiki_ext2syntax, ext)
-      let syn = g:vimwiki_ext2syntax[ext]
-    else
-      let syn = s:vimwiki_defaults.syntax
-    endif
+    let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, s:vimwiki_defaults.syntax)
     call add(g:vimwiki_list, {'path': path, 'ext': ext, 'syntax': syn, 'temp': 1})
     let idx = len(g:vimwiki_list) - 1
     call Validate_wiki_options(idx)
@@ -113,7 +109,7 @@ function! s:setup_buffer_enter() "{{{
 
     " The buffer's file is not in the path and user *does NOT* want his wiki
     " extension to be global -- Do not add new wiki.
-    if idx == -1 && g:vimwiki_global_ext == 0
+    if idx == -1 && vimwiki#vars#get_global('global_ext') == 0
       return
     endif
 
@@ -123,11 +119,7 @@ function! s:setup_buffer_enter() "{{{
     if idx == -1
       let ext = '.'.expand('%:e')
       " lookup syntax using g:vimwiki_ext2syntax
-      if has_key(g:vimwiki_ext2syntax, ext)
-        let syn = g:vimwiki_ext2syntax[ext]
-      else
-        let syn = s:vimwiki_defaults.syntax
-      endif
+      let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, s:vimwiki_defaults.syntax)
       call add(g:vimwiki_list, {'path': path, 'ext': ext, 'syntax': syn, 'temp': 1})
       let idx = len(g:vimwiki_list) - 1
       call Validate_wiki_options(idx)
@@ -156,15 +148,16 @@ function! s:setup_buffer_enter() "{{{
   " Settings foldmethod, foldexpr and foldtext are local to window. Thus in a
   " new tab with the same buffer folding is reset to vim defaults. So we
   " insist vimwiki folding here.
-  if g:vimwiki_folding ==? 'expr'
+  let foldmethod = vimwiki#vars#get_global('folding')
+  if foldmethod ==? 'expr'
     setlocal fdm=expr
     setlocal foldexpr=VimwikiFoldLevel(v:lnum)
     setlocal foldtext=VimwikiFoldText()
-  elseif g:vimwiki_folding ==? 'list' || g:vimwiki_folding ==? 'lists'
+  elseif foldmethod ==? 'list' || foldmethod ==? 'lists'
     setlocal fdm=expr
     setlocal foldexpr=VimwikiFoldListLevel(v:lnum)
     setlocal foldtext=VimwikiFoldText()
-  elseif g:vimwiki_folding ==? 'syntax'
+  elseif foldmethod ==? 'syntax'
     setlocal fdm=syntax
     setlocal foldtext=VimwikiFoldText()
   else
@@ -173,8 +166,8 @@ function! s:setup_buffer_enter() "{{{
   endif
 
   " And conceal level too.
-  if g:vimwiki_conceallevel && exists("+conceallevel")
-    let &conceallevel = g:vimwiki_conceallevel
+  if vimwiki#vars#get_global('conceallevel') && exists("+conceallevel")
+    let &conceallevel = vimwiki#vars#get_global('conceallevel')
   endif
 
   " Set up menu
@@ -191,7 +184,7 @@ function! s:setup_buffer_reenter() "{{{
   if !exists("s:vimwiki_autowriteall")
     let s:vimwiki_autowriteall = &autowriteall
   endif
-  let &autowriteall = g:vimwiki_autowriteall
+  let &autowriteall = vimwiki#vars#get_global('autowriteall')
 endfunction "}}}
 
 function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
@@ -200,7 +193,7 @@ function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
   hi def VimwikiItalic term=italic cterm=italic gui=italic
   hi def VimwikiBoldItalic term=bold cterm=bold gui=bold,italic
   hi def VimwikiUnderline gui=underline
-  if g:vimwiki_hl_headers == 1
+  if vimwiki#vars#get_global('hl_headers') == 1
     for i in range(1,6)
       execute 'hi def VimwikiHeader'.i.' guibg=bg guifg='.g:vimwiki_hcolor_guifg_{&bg}[i-1].' gui=bold ctermfg='.g:vimwiki_hcolor_ctermfg_{&bg}[i-1].' term=bold cterm=bold' 
     endfor
@@ -288,8 +281,8 @@ function! s:vimwiki_get_known_extensions() " {{{
       let extensions['.wiki'] = 1
     endif
   endfor
-  " append map g:vimwiki_ext2syntax
-  for ext in keys(g:vimwiki_ext2syntax)
+  " append extensions from g:vimwiki_ext2syntax
+  for ext in keys(vimwiki#vars#get_global('ext2syntax'))
     let extensions[ext] = 1
   endfor
   return keys(extensions)
@@ -297,6 +290,12 @@ endfunction " }}}
 
 " }}}
 
+
+" Initialization of Vimwiki starts here. Make sure everything below does not
+" cause autoload/base to be loaded
+
+call vimwiki#vars#init()
+
 " CALLBACK functions "{{{
 " User can redefine it.
 if !exists("*VimwikiLinkHandler") "{{{
@@ -362,44 +361,23 @@ let s:vimwiki_defaults.auto_tags = 0
 " DEFAULT options {{{
 call s:default('list', [s:vimwiki_defaults])
 call s:default('use_mouse', 0)
-call s:default('folding', '')
 call s:default('menu', 'Vimwiki')
-call s:default('global_ext', 1)
-call s:default('ext2syntax', {}) " syntax map keyed on extension
-call s:default('hl_headers', 0)
-call s:default('hl_cb_checked', 0)
 call s:default('list_ignore_newline', 1)
 call s:default('listsyms', ' .oOX')
 call s:default('use_calendar', 1)
 call s:default('table_mappings', 1)
 call s:default('table_auto_fmt', 1)
 call s:default('w32_dir_enc', '')
-call s:default('CJK_length', 0)
-call s:default('dir_link', '')
 call s:default('valid_html_tags', 'b,i,s,u,sub,sup,kbd,br,hr,div,center,strong,em')
 call s:default('user_htmls', '')
-call s:default('autowriteall', 1)
 call s:default('toc_header', 'Contents')
 
-call s:default('html_header_numbering', 0)
-call s:default('html_header_numbering_sym', '')
-call s:default('conceallevel', 2)
 call s:default('url_maxsave', 15)
 
-call s:default('diary_months', 
-      \ {
-      \ 1: 'January', 2: 'February', 3: 'March', 
-      \ 4: 'April', 5: 'May', 6: 'June',
-      \ 7: 'July', 8: 'August', 9: 'September',
-      \ 10: 'October', 11: 'November', 12: 'December'
-      \ })
-
 call s:default('map_prefix', '<Leader>w')
 
 call s:default('current_idx', 0)
 
-call s:default('auto_chdir', 0)
-
 " Scheme regexes should be defined even if syntax file is not loaded yet
 " cause users should be able to <leader>w<leader>w without opening any
 " vimwiki file first
@@ -540,7 +518,7 @@ function! s:build_table_menu(topmenu)
   exe 'nmenu disable '.a:topmenu.'.Table'
 endfunction
 
-"XXX make sure anything below does not cause autoload/base to be loaded
+
 if !empty(g:vimwiki_menu)
   call s:build_menu(g:vimwiki_menu)
   call s:build_table_menu(g:vimwiki_menu)
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 0669fa7..5e82f43 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -412,10 +412,10 @@ execute 'syntax match VimwikiList /'.g:vimwiki_rxListItemWithoutCB.'/'
 execute 'syntax match VimwikiList /'.g:vimwiki_rxListDefine.'/'
 execute 'syntax match VimwikiListTodo /'.g:vimwiki_rxListItem.'/'
 
-if g:vimwiki_hl_cb_checked == 1
+if vimwiki#vars#get_global('hl_cb_checked') == 1
   execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemWithoutCB.'\s*\['.g:vimwiki_listsyms_list[4].'\]\s.*$/ '.
         \ 'contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
-elseif g:vimwiki_hl_cb_checked == 2
+elseif vimwiki#vars#get_global('hl_cb_checked') == 2
   execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemAndChildren.'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 endif
 
@@ -481,7 +481,7 @@ execute 'syntax match VimwikiTag /'.g:vimwiki_rxTags.'/'
 
 " header groups highlighting "{{{
 
-if g:vimwiki_hl_headers == 0
+if vimwiki#vars#get_global('hl_headers') == 0
   " Strangely in default colorscheme Title group is not set to bold for cterm...
   if !exists("g:colors_name")
     hi Title cterm=bold

From 49bdf7fa4754eca69426f63e41abf56c4b850b15 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 21 Dec 2016 21:28:48 +0100
Subject: [PATCH 004/108] Use new access functions for global variables -- part
 2

Ref #256
---
 autoload/vimwiki/base.vim   |  4 +--
 autoload/vimwiki/html.vim   |  6 ++---
 autoload/vimwiki/lst.vim    |  2 +-
 ftplugin/vimwiki.vim        | 14 +++++------
 plugin/vimwiki.vim          | 49 +++++++++++++------------------------
 syntax/vimwiki.vim          |  8 +++---
 syntax/vimwiki_default.vim  |  2 +-
 syntax/vimwiki_markdown.vim |  2 +-
 syntax/vimwiki_media.vim    |  2 +-
 9 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 53895bd..2d9ad96 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1771,7 +1771,7 @@ function! vimwiki#base#table_of_contents(create)
     endif
     let h_level = vimwiki#u#count_first_sym(line_content)
     let h_text = vimwiki#u#trim(matchstr(line_content, g:vimwiki_rxHeader))
-    if h_text ==# g:vimwiki_toc_header  " don't include the TOC's header itself
+    if h_text ==# vimwiki#vars#get_global('toc_header')  " don't include the TOC's header itself
       continue
     endif
     let headers_levels[h_level-1] = [h_text, headers_levels[h_level-1][1]+1]
@@ -1811,7 +1811,7 @@ function! vimwiki#base#table_of_contents(create)
 
   let links_rx = '\m^\s*'.vimwiki#u#escape(vimwiki#lst#default_symbol()).' '
 
-  call vimwiki#base#update_listing_in_buffer(lines, g:vimwiki_toc_header, links_rx,
+  call vimwiki#base#update_listing_in_buffer(lines, vimwiki#vars#get_global('toc_header'), links_rx,
         \ 1, a:create)
 endfunction
 "}}}
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index b4aeed6..d2d81b9 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -157,7 +157,7 @@ function! s:delete_html_files(path) "{{{
   let htmlfiles = split(glob(a:path.'**/*.html'), '\n')
   for fname in htmlfiles
     " ignore user html files, e.g. search.html,404.html
-    if stridx(g:vimwiki_user_htmls, fnamemodify(fname, ":t")) >= 0
+    if stridx(vimwiki#vars#get_global('user_htmls'), fnamemodify(fname, ":t")) >= 0
       continue
     endif
 
@@ -933,7 +933,7 @@ function! s:process_tag_list(line, lists) "{{{
           \ substitute(a:line, lstRegExp.'\%('.checkbox.'\)\?', '', ''))
     let processed = 1
   elseif in_list && a:line =~# '^\s\+\S\+'
-    if g:vimwiki_list_ignore_newline
+    if vimwiki#vars#get_global('list_ignore_newline')
       call add(lines, a:line)
     else
       call add(lines, '<br />'.a:line)
@@ -1005,7 +1005,7 @@ function! s:process_tag_h(line, id) "{{{
     let h_id = s:safe_html_anchor(h_text)
     let centered = (a:line =~# '^\s')
 
-    if h_text !=# g:vimwiki_toc_header
+    if h_text !=# vimwiki#vars#get_global('toc_header')
 
       let a:id[h_level-1] = [h_text, a:id[h_level-1][1]+1]
 
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index ee465e4..8e295b6 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1499,7 +1499,7 @@ function! vimwiki#lst#setup_marker_infos() "{{{
   endif
 
   "the user can set the listsyms as string, but vimwiki needs a list
-  let g:vimwiki_listsyms_list = split(g:vimwiki_listsyms, '\zs')
+  let g:vimwiki_listsyms_list = split(vimwiki#vars#get_global('listsyms'), '\zs')
 endfunction "}}}
 
 function! vimwiki#lst#TO_list_item(inner, visual) "{{{
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 76e190a..813118a 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -324,7 +324,7 @@ command! -buffer -nargs=* -complete=custom,vimwiki#tags#complete_tags
 " COMMANDS }}}
 
 " KEYBINDINGS {{{
-if g:vimwiki_use_mouse
+if vimwiki#vars#get_global('use_mouse')
   nmap <buffer> <S-LeftMouse> <NOP>
   nmap <buffer> <C-LeftMouse> <NOP>
   nnoremap <silent><buffer> <2-LeftMouse> :call vimwiki#base#follow_link("nosplit", "\<lt>2-LeftMouse>")<CR>
@@ -335,13 +335,13 @@ endif
 
 
 if !hasmapto('<Plug>Vimwiki2HTML')
-  exe 'nmap <buffer> '.g:vimwiki_map_prefix.'h <Plug>Vimwiki2HTML'
+  exe 'nmap <buffer> '.vimwiki#vars#get_global('map_prefix').'h <Plug>Vimwiki2HTML'
 endif
 nnoremap <script><buffer>
       \ <Plug>Vimwiki2HTML :Vimwiki2HTML<CR>
 
 if !hasmapto('<Plug>Vimwiki2HTMLBrowse')
-  exe 'nmap <buffer> '.g:vimwiki_map_prefix.'hh <Plug>Vimwiki2HTMLBrowse'
+  exe 'nmap <buffer> '.vimwiki#vars#get_global('map_prefix').'hh <Plug>Vimwiki2HTMLBrowse'
 endif
 nnoremap <script><buffer>
       \ <Plug>Vimwiki2HTMLBrowse :Vimwiki2HTMLBrowse<CR>
@@ -408,13 +408,13 @@ nnoremap <silent><script><buffer>
       \ <Plug>VimwikiPrevLink :VimwikiPrevLink<CR>
 
 if !hasmapto('<Plug>VimwikiDeleteLink')
-  exe 'nmap <silent><buffer> '.g:vimwiki_map_prefix.'d <Plug>VimwikiDeleteLink'
+  exe 'nmap <silent><buffer> '.vimwiki#vars#get_global('map_prefix').'d <Plug>VimwikiDeleteLink'
 endif
 nnoremap <silent><script><buffer>
       \ <Plug>VimwikiDeleteLink :VimwikiDeleteLink<CR>
 
 if !hasmapto('<Plug>VimwikiRenameLink')
-  exe 'nmap <silent><buffer> '.g:vimwiki_map_prefix.'r <Plug>VimwikiRenameLink'
+  exe 'nmap <silent><buffer> '.vimwiki#vars#get_global('map_prefix').'r <Plug>VimwikiRenameLink'
 endif
 nnoremap <silent><script><buffer>
       \ <Plug>VimwikiRenameLink :VimwikiRenameLink<CR>
@@ -553,7 +553,7 @@ endfor
 
 
 function! s:CR(normal, just_mrkr) "{{{
-  if g:vimwiki_table_mappings
+  if vimwiki#vars#get_global('table_mappings')
     let res = vimwiki#tbl#kbd_cr()
     if res != ""
       exe "normal! " . res . "\<Right>"
@@ -574,7 +574,7 @@ if !hasmapto('VimwikiReturn', 'i')
 endif
 
 "Table mappings
- if g:vimwiki_table_mappings
+ if vimwiki#vars#get_global('table_mappings')
    inoremap <expr> <buffer> <Tab> vimwiki#tbl#kbd_tab()
    inoremap <expr> <buffer> <S-Tab> vimwiki#tbl#kbd_shift_tab()
  endif
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index d22fe45..4312f20 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -65,8 +65,8 @@ function! s:setup_buffer_leave() "{{{
   let &autowriteall = s:vimwiki_autowriteall
 
   " Set up menu
-  if g:vimwiki_menu != ""
-    exe 'nmenu disable '.g:vimwiki_menu.'.Table'
+  if vimwiki#vars#get_global('menu') != ""
+    exe 'nmenu disable '.vimwiki#vars#get_global('menu').'.Table'
   endif
 endfunction "}}}
 
@@ -171,8 +171,8 @@ function! s:setup_buffer_enter() "{{{
   endif
 
   " Set up menu
-  if g:vimwiki_menu != ""
-    exe 'nmenu enable '.g:vimwiki_menu.'.Table'
+  if vimwiki#vars#get_global('menu') != ""
+    exe 'nmenu enable '.vimwiki#vars#get_global('menu').'.Table'
   endif
 endfunction "}}}
 
@@ -360,21 +360,6 @@ let s:vimwiki_defaults.auto_tags = 0
 
 " DEFAULT options {{{
 call s:default('list', [s:vimwiki_defaults])
-call s:default('use_mouse', 0)
-call s:default('menu', 'Vimwiki')
-call s:default('list_ignore_newline', 1)
-call s:default('listsyms', ' .oOX')
-call s:default('use_calendar', 1)
-call s:default('table_mappings', 1)
-call s:default('table_auto_fmt', 1)
-call s:default('w32_dir_enc', '')
-call s:default('valid_html_tags', 'b,i,s,u,sub,sup,kbd,br,hr,div,center,strong,em')
-call s:default('user_htmls', '')
-call s:default('toc_header', 'Contents')
-
-call s:default('url_maxsave', 15)
-
-call s:default('map_prefix', '<Leader>w')
 
 call s:default('current_idx', 0)
 
@@ -420,7 +405,7 @@ augroup vimwiki
     exe 'autocmd ColorScheme *'.s:ext.' call s:setup_cleared_syntax()'
     " Format tables when exit from insert mode. Do not use textwidth to
     " autowrap tables.
-    if g:vimwiki_table_auto_fmt
+    if vimwiki#vars#get_global('table_auto_fmt')
       exe 'autocmd InsertLeave *'.s:ext.' call vimwiki#tbl#format(line("."))'
       exe 'autocmd InsertEnter *'.s:ext.' call vimwiki#tbl#reset_tw(line("."))'
     endif
@@ -452,43 +437,43 @@ command! VimwikiDiaryGenerateLinks
 
 " MAPPINGS {{{
 if !hasmapto('<Plug>VimwikiIndex')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'w <Plug>VimwikiIndex'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'w <Plug>VimwikiIndex'
 endif
 nnoremap <unique><script> <Plug>VimwikiIndex :VimwikiIndex<CR>
 
 if !hasmapto('<Plug>VimwikiTabIndex')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'t <Plug>VimwikiTabIndex'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'t <Plug>VimwikiTabIndex'
 endif
 nnoremap <unique><script> <Plug>VimwikiTabIndex :VimwikiTabIndex<CR>
 
 if !hasmapto('<Plug>VimwikiUISelect')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'s <Plug>VimwikiUISelect'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'s <Plug>VimwikiUISelect'
 endif
 nnoremap <unique><script> <Plug>VimwikiUISelect :VimwikiUISelect<CR>
 
 if !hasmapto('<Plug>VimwikiDiaryIndex')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'i <Plug>VimwikiDiaryIndex'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'i <Plug>VimwikiDiaryIndex'
 endif
 nnoremap <unique><script> <Plug>VimwikiDiaryIndex :VimwikiDiaryIndex<CR>
 
 if !hasmapto('<Plug>VimwikiDiaryGenerateLinks')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'<Leader>i <Plug>VimwikiDiaryGenerateLinks'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>i <Plug>VimwikiDiaryGenerateLinks'
 endif
 nnoremap <unique><script> <Plug>VimwikiDiaryGenerateLinks :VimwikiDiaryGenerateLinks<CR>
 
 if !hasmapto('<Plug>VimwikiMakeDiaryNote')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'<Leader>w <Plug>VimwikiMakeDiaryNote'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>w <Plug>VimwikiMakeDiaryNote'
 endif
 nnoremap <unique><script> <Plug>VimwikiMakeDiaryNote :VimwikiMakeDiaryNote<CR>
 
 if !hasmapto('<Plug>VimwikiTabMakeDiaryNote')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'<Leader>t <Plug>VimwikiTabMakeDiaryNote'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>t <Plug>VimwikiTabMakeDiaryNote'
 endif
 nnoremap <unique><script> <Plug>VimwikiTabMakeDiaryNote
       \ :VimwikiTabMakeDiaryNote<CR>
 
 if !hasmapto('<Plug>VimwikiMakeYesterdayDiaryNote')
-  exe 'nmap <silent><unique> '.g:vimwiki_map_prefix.'<Leader>y <Plug>VimwikiMakeYesterdayDiaryNote'
+  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>y <Plug>VimwikiMakeYesterdayDiaryNote'
 endif
 nnoremap <unique><script> <Plug>VimwikiMakeYesterdayDiaryNote
       \ :VimwikiMakeYesterdayDiaryNote<CR>
@@ -519,14 +504,14 @@ function! s:build_table_menu(topmenu)
 endfunction
 
 
-if !empty(g:vimwiki_menu)
-  call s:build_menu(g:vimwiki_menu)
-  call s:build_table_menu(g:vimwiki_menu)
+if !empty(vimwiki#vars#get_global('menu'))
+  call s:build_menu(vimwiki#vars#get_global('menu'))
+  call s:build_table_menu(vimwiki#vars#get_global('menu'))
 endif
 " }}}
 
 " CALENDAR Hook "{{{
-if g:vimwiki_use_calendar
+if vimwiki#vars#get_global('use_calendar')
   let g:calendar_action = 'vimwiki#diary#calendar_action'
   let g:calendar_sign = 'vimwiki#diary#calendar_sign'
 endif
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 5e82f43..f0c8a9c 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -344,10 +344,10 @@ let s:options = ' contained transparent contains=NONE'
 "
 " A shortener for long URLs: LinkRest (a middle part of the URL) is concealed
 " VimwikiLinkRest group is left undefined if link shortening is not desired
-if exists("+conceallevel") && g:vimwiki_url_maxsave > 0
+if exists("+conceallevel") && vimwiki#vars#get_global('url_maxsave') > 0
   let s:options .= s:conceal
   execute 'syn match VimwikiLinkRest `\%(///\=[^/ \t]\+/\)\zs\S\+\ze'
-        \.'\%([/#?]\w\|\S\{'.g:vimwiki_url_maxsave.'}\)`'.' cchar=~'.s:options
+        \.'\%([/#?]\w\|\S\{'.vimwiki#vars#get_global('url_maxsave').'}\)`'.' cchar=~'.s:options
 endif
 
 " VimwikiLinkChar is for syntax markers (and also URL when a description
@@ -464,8 +464,8 @@ syntax match VimwikiPlaceholder /^\s*%template\%(\s.*\)\?$/ contains=VimwikiPlac
 syntax match VimwikiPlaceholderParam /\s.*/ contained
 
 " html tags
-if g:vimwiki_valid_html_tags != ''
-  let s:html_tags = join(split(g:vimwiki_valid_html_tags, '\s*,\s*'), '\|')
+if vimwiki#vars#get_global('valid_html_tags') != ''
+  let s:html_tags = join(split(vimwiki#vars#get_global('valid_html_tags'), '\s*,\s*'), '\|')
   exe 'syntax match VimwikiHTMLtag #\c</\?\%('.s:html_tags.'\)\%(\s\{-1}\S\{-}\)\{-}\s*/\?>#'
   execute 'syntax match VimwikiBold #\c<b>.\{-}</b># contains=VimwikiHTMLTag'
   execute 'syntax match VimwikiItalic #\c<i>.\{-}</i># contains=VimwikiHTMLTag'
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
index 6150f99..b4e7b55 100644
--- a/syntax/vimwiki_default.vim
+++ b/syntax/vimwiki_default.vim
@@ -79,7 +79,7 @@ let g:vimwiki_rxListDefine = '::\(\s\|$\)'
 call vimwiki#lst#setup_marker_infos()
 
 let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
+let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
 let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
 
 " Preformatted text
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index c32c7d7..7937db6 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -76,7 +76,7 @@ let g:vimwiki_rxListDefine = '::\%(\s\|$\)'
 call vimwiki#lst#setup_marker_infos()
 
 let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
+let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
 let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
 
 " Preformatted text
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index 9c0498e..a07e52d 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -57,7 +57,7 @@ let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'
 call vimwiki#lst#setup_marker_infos()
 
 let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
+let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
 let g:vimwiki_rxListItemAndChildren = '^\('.g:vimwiki_rxListBullet.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_rxListBullet.'\).*\|^$\|\s.*\)\)*'
 
 " Preformatted text

From 23ee20887a1e3ceac2cb76aaa446afe663ee6983 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 21 Dec 2016 22:11:44 +0100
Subject: [PATCH 005/108] Use new access functions for global variables -- part
 3

Ref #256
---
 autoload/vimwiki/base.vim          |  6 +++---
 autoload/vimwiki/html.vim          |  4 ++--
 autoload/vimwiki/path.vim          |  4 ++--
 autoload/vimwiki/vars.vim          | 33 ++++++++++++++++++++++++++++++
 plugin/vimwiki.vim                 | 20 ------------------
 syntax/vimwiki.vim                 | 27 +++---------------------
 syntax/vimwiki_markdown_custom.vim |  4 ++--
 7 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 2d9ad96..8875e0b 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -253,7 +253,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
   let link_text = a:link_text
 
   " if link is schemeless add wikiN: scheme
-  if link_text !~# g:vimwiki_rxSchemeUrl
+  if link_text !~# vimwiki#vars#get_global('rxSchemeUrl')
     let link_text = 'wiki'.source_wiki.':'.link_text
   endif
 
@@ -267,7 +267,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
 
 
   " extract scheme
-  let link_infos.scheme = matchstr(link_text, g:vimwiki_rxSchemeUrlMatchScheme)
+  let link_infos.scheme = matchstr(link_text, vimwiki#vars#get_global('rxSchemeUrlMatchScheme'))
   if link_infos.scheme == '' || link_text == ''
     let link_infos.filename = ''   " malformed link
     return link_infos
@@ -276,7 +276,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     let link_infos.filename = link_text  " unknown scheme, may be a weblink
     return link_infos
   endif
-  let link_text = matchstr(link_text, g:vimwiki_rxSchemeUrlMatchUrl)
+  let link_text = matchstr(link_text, vimwiki#vars#get_global('rxSchemeUrlMatchUrl'))
 
   let is_wiki_link = link_infos.scheme =~# '\mwiki\d\+' ||
         \ link_infos.scheme ==# 'diary'
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index d2d81b9..10081b5 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1417,8 +1417,8 @@ function! s:convert_file(path_html, wikifile) "{{{
     " prepare constants for s:safe_html_line()
     let s:lt_pattern = '<'
     let s:gt_pattern = '>'
-    if g:vimwiki_valid_html_tags != ''
-      let tags = join(split(g:vimwiki_valid_html_tags, '\s*,\s*'), '\|')
+    if vimwiki#vars#get_global('valid_html_tags') != ''
+      let tags = join(split(vimwiki#vars#get_global('valid_html_tags'), '\s*,\s*'), '\|')
       let s:lt_pattern = '\c<\%(/\?\%('.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?>\)\@!' 
       let s:gt_pattern = '\c\%(</\?\%('.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?\)\@<!>'
     endif
diff --git a/autoload/vimwiki/path.vim b/autoload/vimwiki/path.vim
index f57c6fb..ffa48c3 100644
--- a/autoload/vimwiki/path.vim
+++ b/autoload/vimwiki/path.vim
@@ -127,8 +127,8 @@ function! vimwiki#path#mkdir(path, ...) "{{{
     endif
 
     let path = vimwiki#path#chomp_slash(path)
-    if vimwiki#u#is_windows() && !empty(g:vimwiki_w32_dir_enc)
-      let path = iconv(path, &enc, g:vimwiki_w32_dir_enc)
+    if vimwiki#u#is_windows() && !empty(vimwiki#vars#get_global('w32_dir_enc'))
+      let path = iconv(path, &enc, vimwiki#vars#get_global('w32_dir_enc'))
     endif
 
     if a:0 && a:1 && input("Vimwiki: Make new directory: "
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index f7ccdb8..fd04ca2 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -47,6 +47,39 @@ function! s:populate_global_variables()
       let g:vimwiki_global_vars[key] = g:vimwiki_{key}
     endif
   endfor
+
+  " non-configurable global variables
+
+  " Scheme regexes should be defined even if syntax file is not loaded yet cause users should be
+  " able to <leader>w<leader>w without opening any vimwiki file first
+  let g:vimwiki_global_vars['schemes'] = 'wiki\d\+,diary,local'
+  let g:vimwiki_global_vars['web_schemes1'] = 'http,https,file,ftp,gopher,telnet,nntp,ldap,rsync'.
+        \ ',imap,pop,irc,ircs,cvs,svn,svn+ssh,git,ssh,fish,sftp'
+  let web_schemes2 = 'mailto,news,xmpp,sip,sips,doi,urn,tel'
+
+  let rx_schemes = '\%('.
+        \ join(split(g:vimwiki_global_vars['schemes'], '\s*,\s*'), '\|').'\|'.
+        \ join(split(g:vimwiki_global_vars['web_schemes1'], '\s*,\s*'), '\|').'\|'.
+        \ join(split(web_schemes2, '\s*,\s*'), '\|').
+        \ '\)'
+
+  let g:vimwiki_global_vars['rxSchemeUrl'] = rx_schemes.':.*'
+  let g:vimwiki_global_vars['rxSchemeUrlMatchScheme'] = '\zs'.rx_schemes.'\ze:.*'
+  let g:vimwiki_global_vars['rxSchemeUrlMatchUrl'] = rx_schemes.':\zs.*\ze'
+
+  " match URL for common protocols; see http://en.wikipedia.org/wiki/URI_scheme
+  " http://tools.ietf.org/html/rfc3986
+  let rxWebProtocols =
+        \ '\%('.
+          \ '\%('.
+            \ '\%('.join(split(g:vimwiki_global_vars['web_schemes1'], '\s*,\s*'), '\|').'\):'.
+            \ '\%(//\)'.
+          \ '\)'.
+        \ '\|'.
+          \ '\%('.join(split(web_schemes2, '\s*,\s*'), '\|').'\):'.
+        \ '\)'
+
+  let g:vimwiki_global_vars['rxWeblinkUrl'] = rxWebProtocols . '\S\{-1,}'. '\%(([^ \t()]*)\)\='
 endfunction
 
 
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 4312f20..e12b5fd 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -363,26 +363,6 @@ call s:default('list', [s:vimwiki_defaults])
 
 call s:default('current_idx', 0)
 
-" Scheme regexes should be defined even if syntax file is not loaded yet
-" cause users should be able to <leader>w<leader>w without opening any
-" vimwiki file first
-" Scheme regexes {{{
-call s:default('schemes', 'wiki\d\+,diary,local')
-call s:default('web_schemes1', 'http,https,file,ftp,gopher,telnet,nntp,ldap,'.
-        \ 'rsync,imap,pop,irc,ircs,cvs,svn,svn+ssh,git,ssh,fish,sftp')
-call s:default('web_schemes2', 'mailto,news,xmpp,sip,sips,doi,urn,tel')
-
-let s:rxSchemes = '\%('.
-      \ join(split(g:vimwiki_schemes, '\s*,\s*'), '\|').'\|'. 
-      \ join(split(g:vimwiki_web_schemes1, '\s*,\s*'), '\|').'\|'. 
-      \ join(split(g:vimwiki_web_schemes2, '\s*,\s*'), '\|').
-      \ '\)'
-
-call s:default('rxSchemeUrl', s:rxSchemes.':.*')
-call s:default('rxSchemeUrlMatchScheme', '\zs'.s:rxSchemes.'\ze:.*')
-call s:default('rxSchemeUrlMatchUrl', s:rxSchemes.':\zs.*\ze')
-" scheme regexes }}}
-
 for s:idx in range(len(g:vimwiki_list))
   call Validate_wiki_options(s:idx)
 endfor
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index f0c8a9c..8184e9e 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -22,27 +22,6 @@ endif
   " ...
   "endif
 
-" LINKS: assume this is common to all syntaxes "{{{
-
-" LINKS: WebLinks {{{
-" match URL for common protocols;
-" see http://en.wikipedia.org/wiki/URI_scheme  http://tools.ietf.org/html/rfc3986
-let g:vimwiki_rxWebProtocols = ''.
-      \ '\%('.
-        \ '\%('.
-          \ '\%('.join(split(g:vimwiki_web_schemes1, '\s*,\s*'), '\|').'\):'.
-          \ '\%(//\)'.
-        \ '\)'.
-      \ '\|'.
-        \ '\%('.join(split(g:vimwiki_web_schemes2, '\s*,\s*'), '\|').'\):'.
-      \ '\)'
-"
-let g:vimwiki_rxWeblinkUrl = g:vimwiki_rxWebProtocols .
-    \ '\S\{-1,}'. '\%(([^ \t()]*)\)\='
-" }}}
-
-" }}}
-
 call vimwiki#u#reload_regexes()
 
 " LINKS: setup of larger regexes {{{
@@ -155,7 +134,7 @@ let g:vimwiki_rxWikiInclSuffix1 = g:vimwiki_rxWikiInclArgs.
 " the whitespace.
 " Stuart, could you check it with markdown templated links? [](http://...), as
 " the last bracket is the part of URL now?
-let g:vimwiki_rxWeblink = '\<'. g:vimwiki_rxWeblinkUrl . '\S*'
+let g:vimwiki_rxWeblink = '\<'. vimwiki#vars#get_global('rxWeblinkUrl') . '\S*'
 " 0a) match URL within URL
 let g:vimwiki_rxWeblinkMatchUrl = g:vimwiki_rxWeblink
 " 0b) match DESCRIPTION within URL
@@ -256,8 +235,8 @@ call s:add_target_syntax_ON(g:vimwiki_rxWeblink, 'VimwikiLink')
 " WikiLink
 " All remaining schemes are highlighted automatically
 let s:rxSchemes = '\%('.
-      \ join(split(g:vimwiki_schemes, '\s*,\s*'), '\|').'\|'. 
-      \ join(split(g:vimwiki_web_schemes1, '\s*,\s*'), '\|').
+      \ join(split(vimwiki#vars#get_global('schemes'), '\s*,\s*'), '\|').'\|'.
+      \ join(split(vimwiki#vars#get_global('web_schemes1'), '\s*,\s*'), '\|').
       \ '\):'
 
 " a) match [[nonwiki-scheme-URL]]
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index db39421..2c77515 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -297,8 +297,8 @@ call s:add_target_syntax_ON(g:vimwiki_rxWeblink1, 'VimwikiWeblink1')
 " WikiLink
 " All remaining schemes are highlighted automatically
 let s:rxSchemes = '\%('.
-      \ join(split(g:vimwiki_schemes, '\s*,\s*'), '\|').'\|'. 
-      \ join(split(g:vimwiki_web_schemes1, '\s*,\s*'), '\|').
+      \ join(split(vimwiki#vars#get_global('schemes'), '\s*,\s*'), '\|').'\|'.
+      \ join(split(vimwiki#vars#get_global('web_schemes1'), '\s*,\s*'), '\|').
       \ '\):'
 
 " a) match [nonwiki-scheme-URL]

From 622186195795e19566f5041cece6880a55265545 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 22 Dec 2016 18:16:05 +0100
Subject: [PATCH 006/108] Use new access functions for wiki-local variables --
 part 1

Ref #256
---
 autoload/vimwiki/base.vim  | 14 +++++++-------
 autoload/vimwiki/diary.vim | 37 ++++++++++++++++++-------------------
 autoload/vimwiki/html.vim  |  4 ++--
 autoload/vimwiki/lst.vim   |  5 +++--
 autoload/vimwiki/vars.vim  | 13 +++++++++----
 ftplugin/vimwiki.vim       |  2 +-
 plugin/vimwiki.vim         | 23 +++--------------------
 7 files changed, 43 insertions(+), 55 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 8875e0b..513a0b1 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -335,7 +335,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
 
     let link_infos.filename =
           \ VimwikiGet('path', link_infos.index) .
-          \ VimwikiGet('diary_rel_path', link_infos.index) .
+          \ vimwiki#vars#get_wikilocal('diary_rel_path', link_infos.index) .
           \ link_text .
           \ VimwikiGet('ext', link_infos.index)
   elseif (link_infos.scheme ==# 'file' || link_infos.scheme ==# 'local')
@@ -520,7 +520,7 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
   if wiki_nr >= 0
     let root_directory = VimwikiGet('path', wiki_nr)
   else
-    let root_directory = VimwikiGet('path').VimwikiGet('diary_rel_path')
+    let root_directory = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path')
     let wiki_nr = g:vimwiki_current_idx
   endif
   if a:directories_only
@@ -548,7 +548,7 @@ function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
   if a:wiki_nr == g:vimwiki_current_idx
     let cwd = vimwiki#path#wikify_path(expand('%:p:h'))
   elseif a:wiki_nr < 0
-    let cwd = VimwikiGet('path').VimwikiGet('diary_rel_path')
+    let cwd = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path')
   else
     let cwd = VimwikiGet('path', a:wiki_nr)
   endif
@@ -563,7 +563,7 @@ function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
       if a:wiki_nr == g:vimwiki_current_idx
         let cwd = VimwikiGet('path')
       elseif a:wiki_nr < 0
-        let cwd = VimwikiGet('path').VimwikiGet('diary_rel_path')
+        let cwd = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path')
       endif
       let wikifile = fnamemodify(wikifile, ':r') " strip extension
       let wikifile = '/'.vimwiki#path#relpath(cwd, wikifile)
@@ -1856,7 +1856,7 @@ endfunction " }}}
 " s:is_diary_file
 function! s:is_diary_file(filename) " {{{
   let file_path = vimwiki#path#path_norm(a:filename)
-  let rel_path = VimwikiGet('diary_rel_path')
+  let rel_path = vimwiki#vars#get_wikilocal('diary_rel_path')
   let diary_path = vimwiki#path#path_norm(VimwikiGet('path') . rel_path)
   return rel_path != ''
         \ && file_path =~# '^'.vimwiki#u#escape(diary_path)
@@ -1889,7 +1889,7 @@ function! s:normalize_link_in_diary(lnk) " {{{
   let link = a:lnk . VimwikiGet('ext')
   let link_wiki = VimwikiGet('path') . '/' . link
   let link_diary = VimwikiGet('path') . '/'
-        \ . VimwikiGet('diary_rel_path') . '/' . link
+        \ . vimwiki#vars#get_wikilocal('diary_rel_path') . '/' . link
   let link_exists_in_diary = filereadable(link_diary)
   let link_exists_in_wiki = filereadable(link_wiki)
   let link_is_date = a:lnk =~# '\d\d\d\d-\d\d-\d\d'
@@ -1900,7 +1900,7 @@ function! s:normalize_link_in_diary(lnk) " {{{
     let rxDesc = ''
     let template = g:vimwiki_WikiLinkTemplate1
   else
-    let depth = len(split(VimwikiGet('diary_rel_path'), '/'))
+    let depth = len(split(vimwiki#vars#get_wikilocal('diary_rel_path'), '/'))
     let str = repeat('../', depth) . a:lnk . '|' . a:lnk
     let rxUrl = '^.*\ze|'
     let rxDesc = '|\zs.*$'
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 80b1fa7..0fecbe1 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -20,23 +20,22 @@ function! s:prefix_zero(num) "{{{
   return a:num
 endfunction "}}}
 
-function! s:get_date_link(fmt) "{{{
-  return strftime(a:fmt)
-endfunction "}}}
-
 function! s:diary_path(...) "{{{
   let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-  return VimwikiGet('path', idx).VimwikiGet('diary_rel_path', idx)
+  return VimwikiGet('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx)
 endfunction "}}}
 
 function! s:diary_index(...) "{{{
   let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-  return s:diary_path(idx).VimwikiGet('diary_index', idx).VimwikiGet('ext', idx)
+  return s:diary_path(idx).vimwiki#vars#get_wikilocal('diary_index', idx).VimwikiGet('ext', idx)
 endfunction "}}}
 
-function! s:diary_date_link(...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-  return s:get_date_link(VimwikiGet('diary_link_fmt', idx))
+function! vimwiki#diary#diary_date_link(...) "{{{
+  if a:0
+    return strftime('%Y-%m-%d', a:1)
+  else
+    return strftime('%Y-%m-%d')
+  endif
 endfunction "}}}
 
 function! s:get_position_links(link) "{{{
@@ -45,8 +44,8 @@ function! s:get_position_links(link) "{{{
   if a:link =~# '^\d\{4}-\d\d-\d\d'
     let links = keys(s:get_diary_links())
     " include 'today' into links
-    if index(links, s:diary_date_link()) == -1
-      call add(links, s:diary_date_link())
+    if index(links, vimwiki#diary#diary_date_link()) == -1
+      call add(links, vimwiki#diary#diary_date_link())
     endif
     call sort(links)
     let idx = index(links, a:link)
@@ -85,7 +84,7 @@ endfun "}}}
 
 fun! s:get_diary_links() "{{{
   let rx = '^\d\{4}-\d\d-\d\d'
-  let s_files = glob(VimwikiGet('path').VimwikiGet('diary_rel_path').'*'.VimwikiGet('ext'))
+  let s_files = glob(VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.VimwikiGet('ext'))
   let files = split(s_files, '\n')
   call filter(files, 'fnamemodify(v:val, ":t") =~# "'.escape(rx, '\').'"')
 
@@ -119,7 +118,7 @@ fun! s:group_links(links) "{{{
 endfun "}}}
 
 function! s:sort(lst) "{{{
-  if VimwikiGet("diary_sort") ==? 'desc'
+  if vimwiki#vars#get_wikilocal('diary_sort') ==? 'desc'
     return reverse(sort(a:lst))
   else
     return sort(a:lst)
@@ -172,7 +171,7 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
     let idx = 0
   endif
 
-  call vimwiki#path#mkdir(VimwikiGet('path', idx).VimwikiGet('diary_rel_path', idx))
+  call vimwiki#path#mkdir(VimwikiGet('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx))
 
   if a:0 && a:1 == 1
     let cmd = 'tabedit'
@@ -182,7 +181,7 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
   if a:0>1
     let link = 'diary:'.a:2
   else
-    let link = 'diary:'.s:diary_date_link(idx)
+    let link = 'diary:'.vimwiki#diary#diary_date_link()
   endif
 
   call vimwiki#base#open_link(cmd, link, s:diary_index(idx))
@@ -218,7 +217,7 @@ function! vimwiki#diary#goto_next_day() "{{{
     let link = 'diary:'.links[idx+1]
   else
     " goto today
-    let link = 'diary:'.s:diary_date_link()
+    let link = 'diary:'.vimwiki#diary#diary_date_link()
   endif
 
   if len(link)
@@ -238,7 +237,7 @@ function! vimwiki#diary#goto_prev_day() "{{{
     let link = 'diary:'.links[idx-1]
   else
     " goto today
-    let link = 'diary:'.s:diary_date_link()
+    let link = 'diary:'.vimwiki#diary#diary_date_link()
   endif
 
   if len(link)
@@ -252,7 +251,7 @@ function! vimwiki#diary#generate_diary_section() "{{{
   if vimwiki#path#is_equal(current_file, diary_file)
     let content_rx = '^\%(\s*\* \)\|\%(^\s*$\)\|\%('.g:vimwiki_rxHeader.'\)'
     call vimwiki#base#update_listing_in_buffer(s:format_diary(),
-          \ VimwikiGet('diary_header'), content_rx, line('$')+1, 1)
+          \ vimwiki#vars#get_wikilocal('diary_header'), content_rx, line('$')+1, 1)
   else
     echomsg 'Vimwiki Error: You can generate diary links only in a diary index page!'
   endif
@@ -286,7 +285,7 @@ endfunction "}}}
 function vimwiki#diary#calendar_sign(day, month, year) "{{{
   let day = s:prefix_zero(a:day)
   let month = s:prefix_zero(a:month)
-  let sfile = VimwikiGet('path').VimwikiGet('diary_rel_path').
+  let sfile = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path').
         \ a:year.'-'.month.'-'.day.VimwikiGet('ext')
   return filereadable(expand(sfile))
 endfunction "}}}
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 10081b5..7da33cd 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1348,13 +1348,13 @@ function! s:parse_line(line, state) " {{{
 endfunction " }}}
 
 function! s:use_custom_wiki2html() "{{{
-  let custom_wiki2html = VimwikiGet('custom_wiki2html')
+  let custom_wiki2html = vimwiki#vars#get_wikilocal('custom_wiki2html')
   return !empty(custom_wiki2html) && (s:file_exists(custom_wiki2html) || s:binary_exists(custom_wiki2html))
 endfunction " }}}
 
 function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
   call vimwiki#path#mkdir(a:path)
-  echomsg system(VimwikiGet('custom_wiki2html'). ' '.
+  echomsg system(vimwiki#vars#get_wikilocal('custom_wiki2html'). ' '.
       \ a:force. ' '.
       \ VimwikiGet('syntax'). ' '.
       \ strpart(VimwikiGet('ext'), 1). ' '.
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 8e295b6..7ae8d43 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -113,10 +113,11 @@ function! vimwiki#lst#default_symbol() "{{{
 endfunction "}}}
 
 function! vimwiki#lst#get_list_margin() "{{{
-  if VimwikiGet('list_margin') < 0
+  let list_margin = vimwiki#vars#get_wikilocal('list_margin')
+  if list_margin < 0
     return &sw
   else
-    return VimwikiGet('list_margin')
+    return list_margin
   endif
 endfunction "}}}
 
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index fd04ca2..ca7fd5d 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -105,7 +105,6 @@ function! s:populate_wikilocal_options()
         \ 'custom_wiki2html': '',
         \ 'diary_header': 'Diary',
         \ 'diary_index': 'diary',
-        \ 'diary_link_fmt': '%Y-%m-%d',
         \ 'diary_rel_path': 'diary/',
         \ 'diary_sort': 'desc',
         \ 'ext': '.wiki',
@@ -217,12 +216,18 @@ function! vimwiki#vars#get_global(key)
 endfunction
 
 
-function! vimwiki#vars#get_wikilocal(wiki_nr, key)
-  return g:vimwiki_wikilocal_vars[a:wiki_nr][a:key]
+" the second argument can be a wiki number. When absent, the wiki of the currently active buffer is
+" used
+function! vimwiki#vars#get_wikilocal(key, ...)
+  if a:0
+    return g:vimwiki_wikilocal_vars[a:1][a:key]
+  else
+    return g:vimwiki_wikilocal_vars[vimwiki#vars#get_bufferlocal('wiki_nr')][a:key]
+  endif
 endfunction
 
 
-function! vimwiki#vars#set_wikilocal(wiki_nr, key, value)
+function! vimwiki#vars#set_wikilocal(key, value, wiki_nr)
   if a:wiki_nr == len(g:vimwiki_wikilocal_vars) - 1
     call insert(g:vimwiki_wikilocal_vars, {}, -1)
   endif
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 813118a..3c1bd03 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -655,7 +655,7 @@ if VimwikiGet('auto_toc')
   augroup END
 endif
 
-if VimwikiGet('auto_tags')
+if vimwiki#vars#get_wikilocal('auto_tags')
   " Automatically update tags metadata on page write.
   augroup vimwiki
     au BufWritePost <buffer> call vimwiki#tags#update_tags(0, '')
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index e12b5fd..066fe3c 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -44,8 +44,8 @@ function! Validate_wiki_options(idx) " {{{
   call VimwikiSet('path_html', s:normalize_path(s:path_html(a:idx)), a:idx)
   call VimwikiSet('template_path',
         \ s:normalize_path(VimwikiGet('template_path', a:idx)), a:idx)
-  call VimwikiSet('diary_rel_path',
-        \ s:normalize_path(VimwikiGet('diary_rel_path', a:idx)), a:idx)
+  call vimwiki#vars#set_wikilocal('diary_rel_path',
+        \ s:normalize_path(vimwiki#vars#get_wikilocal('diary_rel_path', a:idx)), a:idx)
 endfunction " }}}
 
 function! s:vimwiki_idx() " {{{
@@ -339,23 +339,6 @@ let s:vimwiki_defaults.auto_toc = 0
 " is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki
 " file.
 let s:vimwiki_defaults.temp = 0
-
-" diary
-let s:vimwiki_defaults.diary_rel_path = 'diary/'
-let s:vimwiki_defaults.diary_index = 'diary'
-let s:vimwiki_defaults.diary_header = 'Diary'
-let s:vimwiki_defaults.diary_sort = 'desc'
-
-" Do not change this! Will wait till vim become more datetime awareable.
-let s:vimwiki_defaults.diary_link_fmt = '%Y-%m-%d'
-
-" NEW! in v2.0
-" custom_wiki2html
-let s:vimwiki_defaults.custom_wiki2html = ''
-"
-let s:vimwiki_defaults.list_margin = -1
-
-let s:vimwiki_defaults.auto_tags = 0
 "}}}
 
 " DEFAULT options {{{
@@ -409,7 +392,7 @@ command! -count=1 VimwikiMakeDiaryNote
 command! -count=1 VimwikiTabMakeDiaryNote
       \ call vimwiki#diary#make_note(v:count1, 1)
 command! -count=1 VimwikiMakeYesterdayDiaryNote
-      \ call vimwiki#diary#make_note(v:count1, 0, strftime(VimwikiGet('diary_link_fmt', v:count1 - 1), localtime() - 60*60*24))
+      \ call vimwiki#diary#make_note(v:count1, 0, vimwiki#diary#diary_date_link(localtime() - 60*60*24))
 
 command! VimwikiDiaryGenerateLinks
       \ call vimwiki#diary#generate_diary_section()

From 61910cd93ac4418a629fe135f8437f2b6f50e661 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 22 Dec 2016 19:12:03 +0100
Subject: [PATCH 007/108] Use new access functions for wiki-local variables --
 part 2

Ref #256
---
 autoload/vimwiki/html.vim | 12 ++++++------
 autoload/vimwiki/vars.vim |  1 +
 ftplugin/vimwiki.vim      |  4 ++--
 plugin/vimwiki.vim        | 12 ++----------
 syntax/vimwiki.vim        |  4 ++--
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 7da33cd..b6310b7 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -88,13 +88,13 @@ endfunction "}}}
 
 function! s:template_full_name(name) "{{{
   if a:name == ''
-    let name = VimwikiGet('template_default')
+    let name = vimwiki#vars#get_wikilocal('template_default')
   else
     let name = a:name
   endif
 
-  let fname = expand(VimwikiGet('template_path').
-        \ name.VimwikiGet('template_ext'))
+  let fname = expand(vimwiki#vars#get_wikilocal('template_path').
+        \ name . vimwiki#vars#get_wikilocal('template_ext'))
 
   if filereadable(fname)
     return fname
@@ -1361,9 +1361,9 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
       \ shellescape(a:path). ' '.
       \ shellescape(a:wikifile). ' '.
       \ shellescape(s:default_CSS_full_name(a:path)). ' '.
-      \ (len(VimwikiGet('template_path'))    > 1 ? shellescape(expand(VimwikiGet('template_path'))) : '-'). ' '.
-      \ (len(VimwikiGet('template_default')) > 0 ? VimwikiGet('template_default')                   : '-'). ' '.
-      \ (len(VimwikiGet('template_ext'))     > 0 ? VimwikiGet('template_ext')                       : '-'). ' '.
+      \ (len(vimwiki#vars#get_wikilocal('template_path')) > 1 ? shellescape(expand(vimwiki#vars#get_wikilocal('template_path'))) : '-'). ' '.
+      \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ? vimwiki#vars#get_wikilocal('template_default') : '-'). ' '.
+      \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ? vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '.
       \ (len(VimwikiGet('subdir'))           > 0 ? shellescape(s:root_path(VimwikiGet('subdir')))   : '-'))
 endfunction " }}}
 
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index ca7fd5d..d9151d9 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -101,6 +101,7 @@ function! s:populate_wikilocal_options()
         \ 'auto_export': 0,
         \ 'auto_tags': 0,
         \ 'auto_toc': 0,
+        \ 'automatic_nested_syntaxes': 1,
         \ 'css_name': 'style.css',
         \ 'custom_wiki2html': '',
         \ 'diary_header': 'Diary',
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 3c1bd03..1308a63 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -639,7 +639,7 @@ nnoremap <silent><buffer> <Plug>VimwikiRemoveHeaderLevel :
 " KEYBINDINGS }}}
 
 " AUTOCOMMANDS {{{
-if VimwikiGet('auto_export')
+if vimwiki#vars#get_wikilocal('auto_export')
   " Automatically generate HTML on page write.
   augroup vimwiki
     au BufWritePost <buffer>
@@ -648,7 +648,7 @@ if VimwikiGet('auto_export')
   augroup END
 endif
 
-if VimwikiGet('auto_toc')
+if vimwiki#vars#get_wikilocal('auto_toc')
   " Automatically update the TOC *before* the file is written
   augroup vimwiki
     au BufWritePre <buffer> call vimwiki#base#table_of_contents(0)
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 066fe3c..9aa8d80 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -42,8 +42,8 @@ endfunction "}}}
 function! Validate_wiki_options(idx) " {{{
   call VimwikiSet('path', s:normalize_path(VimwikiGet('path', a:idx)), a:idx)
   call VimwikiSet('path_html', s:normalize_path(s:path_html(a:idx)), a:idx)
-  call VimwikiSet('template_path',
-        \ s:normalize_path(VimwikiGet('template_path', a:idx)), a:idx)
+  call vimwiki#vars#set_wikilocal('template_path',
+        \ s:normalize_path(vimwiki#vars#get_wikilocal('template_path', a:idx)), a:idx)
   call vimwiki#vars#set_wikilocal('diary_rel_path',
         \ s:normalize_path(vimwiki#vars#get_wikilocal('diary_rel_path', a:idx)), a:idx)
 endfunction " }}}
@@ -328,14 +328,6 @@ let s:vimwiki_defaults.ext = '.wiki'
 let s:vimwiki_defaults.maxhi = 0
 let s:vimwiki_defaults.syntax = 'default'
 
-let s:vimwiki_defaults.template_path = '~/vimwiki/templates/'
-let s:vimwiki_defaults.template_default = 'default'
-let s:vimwiki_defaults.template_ext = '.tpl'
-
-let s:vimwiki_defaults.nested_syntaxes = {}
-let s:vimwiki_defaults.automatic_nested_syntaxes = 1
-let s:vimwiki_defaults.auto_export = 0
-let s:vimwiki_defaults.auto_toc = 0
 " is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki
 " file.
 let s:vimwiki_defaults.temp = 0
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 8184e9e..b16159f 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -572,8 +572,8 @@ call vimwiki#u#reload_regexes_custom()
 let b:current_syntax="vimwiki"
 
 " EMBEDDED syntax setup "{{{
-let s:nested = VimwikiGet('nested_syntaxes')
-if VimwikiGet('automatic_nested_syntaxes')
+let s:nested = vimwiki#vars#get_wikilocal('nested_syntaxes')
+if vimwiki#vars#get_wikilocal('automatic_nested_syntaxes')
   let s:nested = extend(s:nested, vimwiki#base#detect_nested_syntax(), "keep")
 endif
 if !empty(s:nested)

From f497a4abc78d06446ab5507c46ed7b66f06c9570 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 22 Dec 2016 19:55:20 +0100
Subject: [PATCH 008/108] Use new access functions for wiki-local variables --
 part 3

Ref #256
---
 autoload/vimwiki/base.vim          | 46 +++++++++++++++---------------
 autoload/vimwiki/diary.vim         |  8 +++---
 autoload/vimwiki/html.vim          | 19 ++++++------
 autoload/vimwiki/tags.vim          |  4 +--
 ftplugin/vimwiki.vim               | 14 ++++-----
 plugin/vimwiki.vim                 | 16 ++++-------
 syntax/vimwiki.vim                 | 12 +++-----
 syntax/vimwiki_markdown_custom.vim |  2 +-
 8 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 513a0b1..783ace8 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -132,7 +132,7 @@ function! vimwiki#base#setup_buffer_state(idx) " {{{ Init page-specific variable
   call VimwikiSet('invsubdir', vimwiki#base#invsubdir(subdir), a:idx)
 
   if vimwiki#vars#get_global('auto_chdir') == 1
-    exe 'lcd' VimwikiGet('path')
+    exe 'lcd' vimwiki#vars#get_wikilocal('path')
   endif
 
   " update cache
@@ -209,7 +209,7 @@ endfunction "}}}
 
 " vimwiki#base#current_subdir
 function! vimwiki#base#current_subdir(idx)"{{{
-  return vimwiki#base#subdir(VimwikiGet('path', a:idx), expand('%:p'))
+  return vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path', a:idx), expand('%:p'))
 endfunction"}}}
 
 " vimwiki#base#invsubdir
@@ -223,7 +223,7 @@ function! vimwiki#base#find_wiki(path) "{{{
   let path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(a:path))
   let idx = 0
   while idx < len(g:vimwiki_list)
-    let idx_path = expand(VimwikiGet('path', idx))
+    let idx_path = expand(vimwiki#vars#get_wikilocal('path', idx))
     let idx_path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(idx_path))
     if vimwiki#path#is_equal(
           \ vimwiki#path#path_common_pfx(idx_path, path), idx_path)
@@ -316,7 +316,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     endif
 
     if !is_relative || link_infos.index != source_wiki
-      let root_dir = VimwikiGet('path', link_infos.index)
+      let root_dir = vimwiki#vars#get_wikilocal('path', link_infos.index)
     endif
 
     let link_infos.filename = root_dir . link_text
@@ -334,7 +334,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     let link_infos.index = source_wiki
 
     let link_infos.filename =
-          \ VimwikiGet('path', link_infos.index) .
+          \ vimwiki#vars#get_wikilocal('path', link_infos.index) .
           \ vimwiki#vars#get_wikilocal('diary_rel_path', link_infos.index) .
           \ link_text .
           \ VimwikiGet('ext', link_infos.index)
@@ -481,7 +481,7 @@ function! vimwiki#base#goto(...) "{{{
   let anchor = a:0 > 1 ? a:2 : ''
 
   call vimwiki#base#edit_file(':e',
-        \ VimwikiGet('path') . key . VimwikiGet('ext'),
+        \ vimwiki#vars#get_wikilocal('path') . key . VimwikiGet('ext'),
         \ anchor)
 endfunction "}}}
 
@@ -518,9 +518,9 @@ endfunction "}}}
 function! vimwiki#base#find_files(wiki_nr, directories_only)
   let wiki_nr = a:wiki_nr
   if wiki_nr >= 0
-    let root_directory = VimwikiGet('path', wiki_nr)
+    let root_directory = vimwiki#vars#get_wikilocal('path', wiki_nr)
   else
-    let root_directory = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path')
+    let root_directory = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
     let wiki_nr = g:vimwiki_current_idx
   endif
   if a:directories_only
@@ -548,9 +548,9 @@ function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
   if a:wiki_nr == g:vimwiki_current_idx
     let cwd = vimwiki#path#wikify_path(expand('%:p:h'))
   elseif a:wiki_nr < 0
-    let cwd = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path')
+    let cwd = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
   else
-    let cwd = VimwikiGet('path', a:wiki_nr)
+    let cwd = vimwiki#vars#get_wikilocal('path', a:wiki_nr)
   endif
   let result = []
   for wikifile in files
@@ -561,9 +561,9 @@ function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
   if a:also_absolute_links
     for wikifile in files
       if a:wiki_nr == g:vimwiki_current_idx
-        let cwd = VimwikiGet('path')
+        let cwd = vimwiki#vars#get_wikilocal('path')
       elseif a:wiki_nr < 0
-        let cwd = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path')
+        let cwd = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
       endif
       let wikifile = fnamemodify(wikifile, ':r') " strip extension
       let wikifile = '/'.vimwiki#path#relpath(cwd, wikifile)
@@ -578,9 +578,9 @@ function! vimwiki#base#get_wiki_directories(wiki_nr)
   let dirs = vimwiki#base#find_files(a:wiki_nr, 1)
   if a:wiki_nr == g:vimwiki_current_idx
     let cwd = vimwiki#path#wikify_path(expand('%:p:h'))
-    let root_dir = VimwikiGet('path')
+    let root_dir = vimwiki#vars#get_wikilocal('path')
   else
-    let cwd = VimwikiGet('path', a:wiki_nr)
+    let cwd = vimwiki#vars#get_wikilocal('path', a:wiki_nr)
   endif
   let result = ['./']
   for wikidir in dirs
@@ -790,7 +790,7 @@ function! vimwiki#base#check_links() "{{{
 
   " mark every index file as reachable
   for idx in range(len(g:vimwiki_list))
-    let index_file = VimwikiGet('path', idx) . VimwikiGet('index', idx) .
+    let index_file = vimwiki#vars#get_wikilocal('path', idx) . VimwikiGet('index', idx) .
           \ VimwikiGet('ext', idx)
     if filereadable(index_file)
       let reachable_wikifiles[index_file] = 1
@@ -942,7 +942,7 @@ function! s:print_wiki_list() "{{{
       let sep = '   '
       echohl None
     endif
-    echo (idx + 1).sep.VimwikiGet('path', idx)
+    echo (idx + 1) . sep . vimwiki#vars#get_wikilocal('path', idx)
     let idx += 1
   endwhile
   echohl None
@@ -976,7 +976,7 @@ function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
   let old_fname_r = vimwiki#base#apply_template(
         \ g:vimwiki_WikiLinkMatchUrlTemplate, old_fname, '', '')
 
-  let files = split(glob(VimwikiGet('path').a:dir.'*'.VimwikiGet('ext')), '\n')
+  let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.VimwikiGet('ext')), '\n')
   for fname in files
     call s:update_wiki_link(fname, old_fname_r, new_fname)
   endfor
@@ -1309,7 +1309,7 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
 
   call Validate_wiki_options(idx)
   call vimwiki#base#edit_file(cmd,
-        \ VimwikiGet('path', idx).VimwikiGet('index', idx).
+        \ vimwiki#vars#get_wikilocal('path', idx).VimwikiGet('index', idx).
         \ VimwikiGet('ext', idx),
         \ '')
   call vimwiki#base#setup_buffer_state(idx)
@@ -1378,7 +1378,7 @@ function! vimwiki#base#rename_link() "{{{
   endif
   
   let new_link = subdir.new_link
-  let new_fname = VimwikiGet('path').new_link.VimwikiGet('ext')
+  let new_fname = vimwiki#vars#get_wikilocal('path') . new_link . VimwikiGet('ext')
 
   " do not rename if file with such name exists
   let fname = glob(new_fname)
@@ -1389,7 +1389,7 @@ function! vimwiki#base#rename_link() "{{{
   endif
   " rename wiki link file
   try
-    echomsg 'Vimwiki: Renaming '.VimwikiGet('path').old_fname.' to '.new_fname
+    echomsg 'Vimwiki: Renaming '.vimwiki#vars#get_wikilocal('path').old_fname.' to '.new_fname
     let res = rename(expand('%:p'), expand(new_fname))
     if res != 0
       throw "Cannot rename!"
@@ -1857,7 +1857,7 @@ endfunction " }}}
 function! s:is_diary_file(filename) " {{{
   let file_path = vimwiki#path#path_norm(a:filename)
   let rel_path = vimwiki#vars#get_wikilocal('diary_rel_path')
-  let diary_path = vimwiki#path#path_norm(VimwikiGet('path') . rel_path)
+  let diary_path = vimwiki#path#path_norm(vimwiki#vars#get_wikilocal('path') . rel_path)
   return rel_path != ''
         \ && file_path =~# '^'.vimwiki#u#escape(diary_path)
 endfunction " }}}
@@ -1887,8 +1887,8 @@ endfunction " }}}
 " s:normalize_link_in_diary
 function! s:normalize_link_in_diary(lnk) " {{{
   let link = a:lnk . VimwikiGet('ext')
-  let link_wiki = VimwikiGet('path') . '/' . link
-  let link_diary = VimwikiGet('path') . '/'
+  let link_wiki = vimwiki#vars#get_wikilocal('path') . '/' . link
+  let link_diary = vimwiki#vars#get_wikilocal('path') . '/'
         \ . vimwiki#vars#get_wikilocal('diary_rel_path') . '/' . link
   let link_exists_in_diary = filereadable(link_diary)
   let link_exists_in_wiki = filereadable(link_wiki)
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 0fecbe1..744f41c 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -22,7 +22,7 @@ endfunction "}}}
 
 function! s:diary_path(...) "{{{
   let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-  return VimwikiGet('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx)
+  return vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx)
 endfunction "}}}
 
 function! s:diary_index(...) "{{{
@@ -84,7 +84,7 @@ endfun "}}}
 
 fun! s:get_diary_links() "{{{
   let rx = '^\d\{4}-\d\d-\d\d'
-  let s_files = glob(VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.VimwikiGet('ext'))
+  let s_files = glob(vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.VimwikiGet('ext'))
   let files = split(s_files, '\n')
   call filter(files, 'fnamemodify(v:val, ":t") =~# "'.escape(rx, '\').'"')
 
@@ -171,7 +171,7 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
     let idx = 0
   endif
 
-  call vimwiki#path#mkdir(VimwikiGet('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx))
+  call vimwiki#path#mkdir(vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx))
 
   if a:0 && a:1 == 1
     let cmd = 'tabedit'
@@ -285,7 +285,7 @@ endfunction "}}}
 function vimwiki#diary#calendar_sign(day, month, year) "{{{
   let day = s:prefix_zero(a:day)
   let month = s:prefix_zero(a:month)
-  let sfile = VimwikiGet('path').vimwiki#vars#get_wikilocal('diary_rel_path').
+  let sfile = vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').
         \ a:year.'-'.month.'-'.day.VimwikiGet('ext')
   return filereadable(expand(sfile))
 endfunction "}}}
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index b6310b7..5c466ec 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -68,7 +68,7 @@ endfunction " }}}
 
 function! s:default_CSS_full_name(path) " {{{
   let path = expand(a:path)
-  let css_full_name = path.VimwikiGet('css_name')
+  let css_full_name = path . vimwiki#vars#get_wikilocal('css_name')
   return css_full_name
 endfunction "}}}
 
@@ -162,8 +162,8 @@ function! s:delete_html_files(path) "{{{
     endif
 
     " delete if there is no corresponding wiki file
-    let subdir = vimwiki#base#subdir(VimwikiGet('path_html'), fname)
-    let wikifile = VimwikiGet('path').subdir.
+    let subdir = vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path_html'), fname)
+    let wikifile = vimwiki#vars#get_wikilocal('path').subdir.
           \fnamemodify(fname, ":t:r").VimwikiGet('ext')
     if filereadable(wikifile)
       continue
@@ -231,7 +231,7 @@ function! s:is_html_uptodate(wikifile) "{{{
   endif
 
   let wikifile = fnamemodify(a:wikifile, ":p")
-  let htmlfile = expand(VimwikiGet('path_html').VimwikiGet('subdir').
+  let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') . VimwikiGet('subdir') .
         \fnamemodify(wikifile, ":t:r").".html")
 
   if getftime(wikifile) <= getftime(htmlfile) && tpl_time <= getftime(htmlfile)
@@ -1483,7 +1483,7 @@ function! s:convert_file(path_html, wikifile) "{{{
     call map(html_lines, 'substitute(v:val, "%root_path%", "'.
           \ s:root_path(VimwikiGet('subdir')) .'", "g")')
 
-    let css_name = expand(VimwikiGet('css_name'))
+    let css_name = expand(vimwiki#vars#get_wikilocal('css_name'))
     let css_name = substitute(css_name, '\', '/', 'g')
     call map(html_lines, 'substitute(v:val, "%css%", "'. css_name .'", "g")')
 
@@ -1544,12 +1544,12 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
   let current_subdir = VimwikiGet('subdir')
   let current_invsubdir = VimwikiGet('invsubdir')
 
-  let wikifiles = split(glob(VimwikiGet('path').'**/*'.VimwikiGet('ext')), '\n')
+  let wikifiles = split(glob(vimwiki#vars#get_wikilocal('path').'**/*'.VimwikiGet('ext')), '\n')
   for wikifile in wikifiles
     let wikifile = fnamemodify(wikifile, ":p")
 
     " temporarily adjust 'subdir' and 'invsubdir' state variables
-    let subdir = vimwiki#base#subdir(VimwikiGet('path'), wikifile)
+    let subdir = vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path'), wikifile)
     call VimwikiSet('subdir', subdir)
     call VimwikiSet('invsubdir', vimwiki#base#invsubdir(subdir))
 
@@ -1583,10 +1583,9 @@ function! s:binary_exists(fname) "{{{
   return executable(expand(a:fname))
 endfunction "}}}
 
-" uses VimwikiGet('path')
 function! s:get_wikifile_url(wikifile) "{{{
-  return VimwikiGet('path_html').
-    \ vimwiki#base#subdir(VimwikiGet('path'), a:wikifile).
+  return vimwiki#vars#get_wikilocal('path_html') .
+    \ vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path'), a:wikifile).
     \ fnamemodify(a:wikifile, ":t:r").'.html'
 endfunction "}}}
 
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index 9585641..d0fa45d 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -41,7 +41,7 @@ function! vimwiki#tags#update_tags(full_rebuild, all_files) "{{{
     call s:write_tags_metadata(metadata)
   else " full rebuild
     let files = vimwiki#base#find_files(g:vimwiki_current_idx, 0)
-    let wiki_base_dir = VimwikiGet('path', g:vimwiki_current_idx)
+    let wiki_base_dir = vimwiki#vars#get_wikilocal('path', g:vimwiki_current_idx)
     let tags_file_last_modification =
           \ getftime(vimwiki#tags#metadata_file_path())
     let metadata = s:load_tags_metadata()
@@ -141,7 +141,7 @@ endfunction " }}}
 " vimwiki#tags#metadata_file_path
 "   Returns tags metadata file path
 function! vimwiki#tags#metadata_file_path() abort "{{{
-  return fnamemodify(vimwiki#path#join_path(VimwikiGet('path'), s:TAGS_METADATA_FILE_NAME), ':p')
+  return fnamemodify(vimwiki#path#join_path(vimwiki#vars#get_wikilocal('path'), s:TAGS_METADATA_FILE_NAME), ':p')
 endfunction " }}}
 
 " s:load_tags_metadata
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 1308a63..ab9118c 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -245,18 +245,18 @@ endfunction "}}}
 command! -buffer Vimwiki2HTML
       \ if filewritable(expand('%')) | silent noautocmd w | endif
       \ <bar>
-      \ let res = vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')),
+      \ let res = vimwiki#html#Wiki2HTML(expand(vimwiki#vars#get_wikilocal('path_html')),
       \                             expand('%'))
       \ <bar>
-      \ if res != '' | echo 'Vimwiki: HTML conversion is done, output: '.expand(VimwikiGet('path_html')) | endif
+      \ if res != '' | echo 'Vimwiki: HTML conversion is done, output: ' . expand(vimwiki#vars#get_wikilocal('path_html')) | endif
 command! -buffer Vimwiki2HTMLBrowse
       \ if filewritable(expand('%')) | silent noautocmd w | endif
       \ <bar>
       \ call vimwiki#base#system_open_link(vimwiki#html#Wiki2HTML(
-      \         expand(VimwikiGet('path_html')),
+      \         expand(vimwiki#vars#get_wikilocal('path_html')),
       \         expand('%')))
 command! -buffer VimwikiAll2HTML
-      \ call vimwiki#html#WikiAll2HTML(expand(VimwikiGet('path_html')))
+      \ call vimwiki#html#WikiAll2HTML(expand(vimwiki#vars#get_wikilocal('path_html')))
 
 command! -buffer VimwikiTOC call vimwiki#base#table_of_contents(1)
 
@@ -279,10 +279,10 @@ command! -buffer -nargs=0 VimwikiBacklinks call vimwiki#base#backlinks()
 command! -buffer -nargs=0 VWB call vimwiki#base#backlinks()
 
 exe 'command! -buffer -nargs=* VimwikiSearch lvimgrep <args> '.
-      \ escape(VimwikiGet('path').'**/*'.VimwikiGet('ext'), ' ')
+      \ escape(vimwiki#vars#get_wikilocal('path').'**/*'.VimwikiGet('ext'), ' ')
 
 exe 'command! -buffer -nargs=* VWS lvimgrep <args> '.
-      \ escape(VimwikiGet('path').'**/*'.VimwikiGet('ext'), ' ')
+      \ escape(vimwiki#vars#get_wikilocal('path').'**/*'.VimwikiGet('ext'), ' ')
 
 command! -buffer -nargs=+ -complete=custom,vimwiki#base#complete_links_escaped
       \ VimwikiGoto call vimwiki#base#goto(<f-args>)
@@ -643,7 +643,7 @@ if vimwiki#vars#get_wikilocal('auto_export')
   " Automatically generate HTML on page write.
   augroup vimwiki
     au BufWritePost <buffer>
-      \ call vimwiki#html#Wiki2HTML(expand(VimwikiGet('path_html')),
+      \ call vimwiki#html#Wiki2HTML(expand(vimwiki#vars#get_wikilocal('path_html')),
       \                             expand('%'))
   augroup END
 endif
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 9aa8d80..3e65cbd 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -20,11 +20,11 @@ function! s:default(varname, value) "{{{
 endfunction "}}}
 
 function! s:path_html(idx) "{{{
-  let path_html = VimwikiGet('path_html', a:idx)
+  let path_html = vimwiki#vars#get_wikilocal('path_html', a:idx)
   if !empty(path_html)
     return path_html
   else
-    let path = VimwikiGet('path', a:idx)
+    let path = vimwiki#vars#get_wikilocal('path', a:idx)
     return substitute(path, '[/\\]\+$', '', '').'_html/'
   endif
 endfunction "}}}
@@ -40,8 +40,8 @@ function! s:normalize_path(path) "{{{
 endfunction "}}}
 
 function! Validate_wiki_options(idx) " {{{
-  call VimwikiSet('path', s:normalize_path(VimwikiGet('path', a:idx)), a:idx)
-  call VimwikiSet('path_html', s:normalize_path(s:path_html(a:idx)), a:idx)
+  call vimwiki#vars#set_wikilocal('path', s:normalize_path(vimwiki#vars#get_wikilocal('path', a:idx)), a:idx)
+  call vimwiki#vars#set_wikilocal('path_html', s:normalize_path(s:path_html(a:idx)), a:idx)
   call vimwiki#vars#set_wikilocal('template_path',
         \ s:normalize_path(vimwiki#vars#get_wikilocal('template_path', a:idx)), a:idx)
   call vimwiki#vars#set_wikilocal('diary_rel_path',
@@ -139,7 +139,7 @@ function! s:setup_buffer_enter() "{{{
     " to force a rescan of the filesystem which may have changed
     " and update VimwikiLinks syntax group that depends on it;
     " b:vimwiki_fs_rescan indicates that setup_filetype() has not been run
-    if exists("b:vimwiki_fs_rescan") && VimwikiGet('maxhi')
+    if exists("b:vimwiki_fs_rescan") && vimwiki#vars#get_wikilocal('maxhi')
       set syntax=vimwiki
     endif
     let b:vimwiki_fs_rescan = 1
@@ -320,12 +320,8 @@ endif "}}}
 
 " DEFAULT wiki {{{
 let s:vimwiki_defaults = {}
-let s:vimwiki_defaults.path = '~/vimwiki/'
-let s:vimwiki_defaults.path_html = ''   " '' is replaced by derived path.'_html/'
-let s:vimwiki_defaults.css_name = 'style.css'
 let s:vimwiki_defaults.index = 'index'
 let s:vimwiki_defaults.ext = '.wiki'
-let s:vimwiki_defaults.maxhi = 0
 let s:vimwiki_defaults.syntax = 'default'
 
 " is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki
@@ -439,7 +435,7 @@ nnoremap <unique><script> <Plug>VimwikiMakeYesterdayDiaryNote
 function! s:build_menu(topmenu)
   let idx = 0
   while idx < len(g:vimwiki_list)
-    let norm_path = fnamemodify(VimwikiGet('path', idx), ':h:t')
+    let norm_path = fnamemodify(vimwiki#vars#get_wikilocal('path', idx), ':h:t')
     let norm_path = escape(norm_path, '\ \.')
     execute 'menu '.a:topmenu.'.Open\ index.'.norm_path.
           \ ' :call vimwiki#base#goto_index('.(idx + 1).')<CR>'
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index b16159f..62f06b2 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -9,18 +9,14 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-"TODO do nothing if ...? (?)
-if VimwikiGet('maxhi')
+
+if vimwiki#vars#get_wikilocal('maxhi')
   let b:existing_wikifiles =
         \ vimwiki#base#get_wikilinks(g:vimwiki_current_idx, 1)
   let b:existing_wikidirs  =
         \ vimwiki#base#get_wiki_directories(g:vimwiki_current_idx)
 endif
-  "let b:xxx = 1
-  "TODO ? update wikilink syntax group here if really needed (?) for :e and such
-  "if VimwikiGet('maxhi')
-  " ...
-  "endif
+
 
 call vimwiki#u#reload_regexes()
 
@@ -214,7 +210,7 @@ endfunction "}}}
 
 
 " use max highlighting - could be quite slow if there are too many wikifiles
-if VimwikiGet('maxhi')
+if vimwiki#vars#get_wikilocal('maxhi')
   " WikiLink
   call s:add_target_syntax_OFF(g:vimwiki_rxWikiLink)
   " WikiIncl
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index 2c77515..1d4fde9 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -280,7 +280,7 @@ endfunction "}}}
 
 
 " use max highlighting - could be quite slow if there are too many wikifiles
-if VimwikiGet('maxhi')
+if vimwiki#vars#get_wikilocal('maxhi')
   " WikiLink
   call s:add_target_syntax_OFF(g:vimwiki_rxWikiLink1, 'VimwikiWikiLink1')
 

From 2329d602a761c99cfc768ffcdde6c898d21ede03 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 22 Dec 2016 21:00:19 +0100
Subject: [PATCH 009/108] Use new access functions for wiki-local variables --
 part 4

Ref #256
---
 autoload/vimwiki/base.vim          | 30 +++++++++++++++---------------
 autoload/vimwiki/diary.vim         |  6 +++---
 autoload/vimwiki/html.vim          |  6 +++---
 autoload/vimwiki/markdown_base.vim |  2 +-
 autoload/vimwiki/tags.vim          |  2 +-
 ftplugin/vimwiki.vim               |  6 +++---
 plugin/vimwiki.vim                 | 11 +++--------
 7 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 783ace8..02b7b61 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -324,10 +324,10 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     if vimwiki#path#is_link_to_dir(link_text)
       if vimwiki#vars#get_global('dir_link') != ''
         let link_infos.filename .= vimwiki#vars#get_global('dir_link') .
-              \ VimwikiGet('ext', link_infos.index)
+              \ vimwiki#vars#get_wikilocal('ext', link_infos.index)
       endif
     else
-      let link_infos.filename .= VimwikiGet('ext', link_infos.index)
+      let link_infos.filename .= vimwiki#vars#get_wikilocal('ext', link_infos.index)
     endif
 
   elseif link_infos.scheme ==# 'diary'
@@ -337,7 +337,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
           \ vimwiki#vars#get_wikilocal('path', link_infos.index) .
           \ vimwiki#vars#get_wikilocal('diary_rel_path', link_infos.index) .
           \ link_text .
-          \ VimwikiGet('ext', link_infos.index)
+          \ vimwiki#vars#get_wikilocal('ext', link_infos.index)
   elseif (link_infos.scheme ==# 'file' || link_infos.scheme ==# 'local')
         \ && is_relative
     let link_infos.filename = simplify(root_dir . link_text)
@@ -437,9 +437,9 @@ function! vimwiki#base#get_globlinks_escaped() abort "{{{only get links from the
   let orig_pwd = getcwd()
   lcd! %:h
   " all path are relative to the current file's location 
-  let globlinks = glob('*'.VimwikiGet('ext'),1)."\n"
+  let globlinks = glob('*'.vimwiki#vars#get_wikilocal('ext'), 1)."\n"
   " remove extensions
-  let globlinks = substitute(globlinks, '\'.VimwikiGet('ext').'\ze\n', '', 'g')
+  let globlinks = substitute(globlinks, '\'.vimwiki#vars#get_wikilocal('ext').'\ze\n', '', 'g')
   " restore the original working directory
   exe 'lcd! '.orig_pwd
   " convert to a List
@@ -481,7 +481,7 @@ function! vimwiki#base#goto(...) "{{{
   let anchor = a:0 > 1 ? a:2 : ''
 
   call vimwiki#base#edit_file(':e',
-        \ vimwiki#vars#get_wikilocal('path') . key . VimwikiGet('ext'),
+        \ vimwiki#vars#get_wikilocal('path') . key . vimwiki#vars#get_wikilocal('ext'),
         \ anchor)
 endfunction "}}}
 
@@ -526,7 +526,7 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
   if a:directories_only
     let ext = '/'
   else
-    let ext = VimwikiGet('ext', wiki_nr)
+    let ext = vimwiki#vars#get_wikilocal('ext', wiki_nr)
   endif
   " if current wiki is temporary -- was added by an arbitrary wiki file then do
   " not search wiki files in subdirectories. Or it would hang the system if
@@ -790,8 +790,8 @@ function! vimwiki#base#check_links() "{{{
 
   " mark every index file as reachable
   for idx in range(len(g:vimwiki_list))
-    let index_file = vimwiki#vars#get_wikilocal('path', idx) . VimwikiGet('index', idx) .
-          \ VimwikiGet('ext', idx)
+    let index_file = vimwiki#vars#get_wikilocal('path', idx) . vimwiki#vars#get_wikilocal('index', idx) .
+          \ vimwiki#vars#get_wikilocal('ext', idx)
     if filereadable(index_file)
       let reachable_wikifiles[index_file] = 1
     endif
@@ -976,7 +976,7 @@ function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
   let old_fname_r = vimwiki#base#apply_template(
         \ g:vimwiki_WikiLinkMatchUrlTemplate, old_fname, '', '')
 
-  let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.VimwikiGet('ext')), '\n')
+  let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.vimwiki#vars#get_wikilocal('ext')), '\n')
   for fname in files
     call s:update_wiki_link(fname, old_fname_r, new_fname)
   endfor
@@ -1030,7 +1030,7 @@ function! s:get_wiki_buffers() "{{{
   while bcount<=bufnr("$")
     if bufexists(bcount)
       let bname = fnamemodify(bufname(bcount), ":p")
-      if bname =~# VimwikiGet('ext')."$"
+      if bname =~# vimwiki#vars#get_wikilocal('ext')."$"
         let bitem = [bname, getbufvar(bname, "vimwiki_prev_link")]
         call add(blist, bitem)
       endif
@@ -1309,8 +1309,8 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
 
   call Validate_wiki_options(idx)
   call vimwiki#base#edit_file(cmd,
-        \ vimwiki#vars#get_wikilocal('path', idx).VimwikiGet('index', idx).
-        \ VimwikiGet('ext', idx),
+        \ vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('index', idx).
+        \ vimwiki#vars#get_wikilocal('ext', idx),
         \ '')
   call vimwiki#base#setup_buffer_state(idx)
 endfunction "}}}
@@ -1378,7 +1378,7 @@ function! vimwiki#base#rename_link() "{{{
   endif
   
   let new_link = subdir.new_link
-  let new_fname = vimwiki#vars#get_wikilocal('path') . new_link . VimwikiGet('ext')
+  let new_fname = vimwiki#vars#get_wikilocal('path') . new_link . vimwiki#vars#get_wikilocal('ext')
 
   " do not rename if file with such name exists
   let fname = glob(new_fname)
@@ -1886,7 +1886,7 @@ endfunction " }}}
 
 " s:normalize_link_in_diary
 function! s:normalize_link_in_diary(lnk) " {{{
-  let link = a:lnk . VimwikiGet('ext')
+  let link = a:lnk . vimwiki#vars#get_wikilocal('ext')
   let link_wiki = vimwiki#vars#get_wikilocal('path') . '/' . link
   let link_diary = vimwiki#vars#get_wikilocal('path') . '/'
         \ . vimwiki#vars#get_wikilocal('diary_rel_path') . '/' . link
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 744f41c..609dbf3 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -27,7 +27,7 @@ endfunction "}}}
 
 function! s:diary_index(...) "{{{
   let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-  return s:diary_path(idx).vimwiki#vars#get_wikilocal('diary_index', idx).VimwikiGet('ext', idx)
+  return s:diary_path(idx).vimwiki#vars#get_wikilocal('diary_index', idx).vimwiki#vars#get_wikilocal('ext', idx)
 endfunction "}}}
 
 function! vimwiki#diary#diary_date_link(...) "{{{
@@ -84,7 +84,7 @@ endfun "}}}
 
 fun! s:get_diary_links() "{{{
   let rx = '^\d\{4}-\d\d-\d\d'
-  let s_files = glob(vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.VimwikiGet('ext'))
+  let s_files = glob(vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.vimwiki#vars#get_wikilocal('ext'))
   let files = split(s_files, '\n')
   call filter(files, 'fnamemodify(v:val, ":t") =~# "'.escape(rx, '\').'"')
 
@@ -286,7 +286,7 @@ function vimwiki#diary#calendar_sign(day, month, year) "{{{
   let day = s:prefix_zero(a:day)
   let month = s:prefix_zero(a:month)
   let sfile = vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').
-        \ a:year.'-'.month.'-'.day.VimwikiGet('ext')
+        \ a:year.'-'.month.'-'.day.vimwiki#vars#get_wikilocal('ext')
   return filereadable(expand(sfile))
 endfunction "}}}
 
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 5c466ec..109965e 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -164,7 +164,7 @@ function! s:delete_html_files(path) "{{{
     " delete if there is no corresponding wiki file
     let subdir = vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path_html'), fname)
     let wikifile = vimwiki#vars#get_wikilocal('path').subdir.
-          \fnamemodify(fname, ":t:r").VimwikiGet('ext')
+          \fnamemodify(fname, ":t:r").vimwiki#vars#get_wikilocal('ext')
     if filereadable(wikifile)
       continue
     endif
@@ -1357,7 +1357,7 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
   echomsg system(vimwiki#vars#get_wikilocal('custom_wiki2html'). ' '.
       \ a:force. ' '.
       \ VimwikiGet('syntax'). ' '.
-      \ strpart(VimwikiGet('ext'), 1). ' '.
+      \ strpart(vimwiki#vars#get_wikilocal('ext'), 1). ' '.
       \ shellescape(a:path). ' '.
       \ shellescape(a:wikifile). ' '.
       \ shellescape(s:default_CSS_full_name(a:path)). ' '.
@@ -1544,7 +1544,7 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
   let current_subdir = VimwikiGet('subdir')
   let current_invsubdir = VimwikiGet('invsubdir')
 
-  let wikifiles = split(glob(vimwiki#vars#get_wikilocal('path').'**/*'.VimwikiGet('ext')), '\n')
+  let wikifiles = split(glob(vimwiki#vars#get_wikilocal('path').'**/*'.vimwiki#vars#get_wikilocal('ext')), '\n')
   for wikifile in wikifiles
     let wikifile = fnamemodify(wikifile, ":p")
 
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index ef2eb36..e35e8b0 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -109,7 +109,7 @@ function! vimwiki#markdown_base#follow_link(split, ...) "{{{ Parse link at curso
       if !VimwikiLinkHandler(lnk)
         if !vimwiki#markdown_base#open_reflink(lnk)
           " remove the extension from the filename if exists
-          let lnk = substitute(lnk, VimwikiGet('ext').'$', '', '')
+          let lnk = substitute(lnk, vimwiki#vars#get_wikilocal('ext').'$', '', '')
           call vimwiki#base#open_link(cmd, lnk)
         endif
       endif
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index d0fa45d..311c111 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -261,7 +261,7 @@ function! s:write_tags_metadata(metadata) "{{{
       let entry_data = substitute(entry_data, "\n", '\\n', 'g')
       call add(tags,
             \   entry.tagname  . "\t"
-            \ . pagename . VimwikiGet('ext') . "\t"
+            \ . pagename . vimwiki#vars#get_wikilocal('ext') . "\t"
             \ . entry.lineno
             \ . ';"'
             \ . "\t" . "vimwiki:" . entry_data
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index ab9118c..970bb69 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -27,7 +27,7 @@ if vimwiki#vars#get_global('conceallevel') && exists("+conceallevel")
 endif
 
 " GOTO FILE: gf {{{
-execute 'setlocal suffixesadd='.VimwikiGet('ext')
+execute 'setlocal suffixesadd='.vimwiki#vars#get_wikilocal('ext')
 setlocal isfname-=[,]
 " gf}}}
 
@@ -279,10 +279,10 @@ command! -buffer -nargs=0 VimwikiBacklinks call vimwiki#base#backlinks()
 command! -buffer -nargs=0 VWB call vimwiki#base#backlinks()
 
 exe 'command! -buffer -nargs=* VimwikiSearch lvimgrep <args> '.
-      \ escape(vimwiki#vars#get_wikilocal('path').'**/*'.VimwikiGet('ext'), ' ')
+      \ escape(vimwiki#vars#get_wikilocal('path').'**/*'.vimwiki#vars#get_wikilocal('ext'), ' ')
 
 exe 'command! -buffer -nargs=* VWS lvimgrep <args> '.
-      \ escape(vimwiki#vars#get_wikilocal('path').'**/*'.VimwikiGet('ext'), ' ')
+      \ escape(vimwiki#vars#get_wikilocal('path').'**/*'.vimwiki#vars#get_wikilocal('ext'), ' ')
 
 command! -buffer -nargs=+ -complete=custom,vimwiki#base#complete_links_escaped
       \ VimwikiGoto call vimwiki#base#goto(<f-args>)
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 3e65cbd..26eb8dd 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -274,12 +274,9 @@ endfunction "}}}
 function! s:vimwiki_get_known_extensions() " {{{
   " Getting all extensions that different wikis could have
   let extensions = {}
-  for wiki in g:vimwiki_list
-    if has_key(wiki, 'ext')
-      let extensions[wiki.ext] = 1
-    else
-      let extensions['.wiki'] = 1
-    endif
+  for idx in range(vimwiki#vars#number_of_wikis())
+    let ext = vimwiki#vars#get_wikilocal('ext', idx)
+    let extensions[ext] = 1
   endfor
   " append extensions from g:vimwiki_ext2syntax
   for ext in keys(vimwiki#vars#get_global('ext2syntax'))
@@ -320,8 +317,6 @@ endif "}}}
 
 " DEFAULT wiki {{{
 let s:vimwiki_defaults = {}
-let s:vimwiki_defaults.index = 'index'
-let s:vimwiki_defaults.ext = '.wiki'
 let s:vimwiki_defaults.syntax = 'default'
 
 " is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki

From 250fd3c47b0682b97ae4f0d943857f7d9c8310b9 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 23 Dec 2016 20:05:53 +0100
Subject: [PATCH 010/108] Use new access functions for wiki-local variables --
 part 5

Ref #256
---
 autoload/vimwiki/base.vim | 32 +++++++++++++++++---------------
 autoload/vimwiki/html.vim |  4 ++--
 autoload/vimwiki/lst.vim  | 14 +++++++-------
 autoload/vimwiki/tags.vim |  5 +++--
 autoload/vimwiki/u.vim    |  4 ++--
 autoload/vimwiki/vars.vim |  5 +++++
 ftplugin/vimwiki.vim      |  4 ++--
 plugin/vimwiki.vim        |  5 ++---
 8 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 02b7b61..b7efcb8 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -13,10 +13,9 @@ function! s:vimwiki_get_known_syntaxes() " {{{
   " Getting all syntaxes that different wikis could have
   let syntaxes = {}
   let syntaxes['default'] = 1
-  for wiki in g:vimwiki_list
-    if has_key(wiki, 'syntax')
-      let syntaxes[wiki.syntax] = 1
-    endif
+  for wiki_nr in range(vimwiki#vars#number_of_wikis())
+    let wiki_syntax = vimwiki#vars#get_wikilocal('syntax', wiki_nr)
+    let syntaxes[wiki_syntax] = 1
   endfor
   " also consider the syntaxes from g:vimwiki_ext2syntax
   for syn in values(vimwiki#vars#get_global('ext2syntax'))
@@ -490,7 +489,7 @@ function! vimwiki#base#backlinks() "{{{
   let current_filename = expand("%:p")
   let locations = []
   for idx in range(len(g:vimwiki_list))
-    let syntax = VimwikiGet('syntax', idx)
+    let syntax = vimwiki#vars#get_wikilocal('syntax', idx)
     let wikifiles = vimwiki#base#find_files(idx, 0)
     for source_file in wikifiles
       let links = s:get_links(source_file, idx)
@@ -675,14 +674,17 @@ function! s:jump_to_anchor(anchor) "{{{
   let anchor = vimwiki#u#escape(a:anchor)
 
   let segments = split(anchor, '#', 0)
+
+  let current_syntax = vimwiki#vars#get_wikilocal('syntax')
+
   for segment in segments
 
     let anchor_header = substitute(
-          \ g:vimwiki_{VimwikiGet('syntax')}_header_match,
+          \ g:vimwiki_{current_syntax}_header_match,
           \ '__Header__', "\\='".segment."'", '')
-    let anchor_bold = substitute(g:vimwiki_{VimwikiGet('syntax')}_bold_match,
+    let anchor_bold = substitute(g:vimwiki_{current_syntax}_bold_match,
           \ '__Text__', "\\='".segment."'", '')
-    let anchor_tag = substitute(g:vimwiki_{VimwikiGet('syntax')}_tag_match,
+    let anchor_tag = substitute(g:vimwiki_{current_syntax}_tag_match,
           \ '__Tag__', "\\='".segment."'", '')
 
     if         !search(anchor_tag, 'Wc')
@@ -704,7 +706,7 @@ function! s:get_links(wikifile, idx) "{{{
     return []
   endif
 
-  let syntax = VimwikiGet('syntax', a:idx)
+  let syntax = vimwiki#vars#get_wikilocal('syntax', a:idx)
   let rx_link = g:vimwiki_{syntax}_wikilink
   let links = []
   let lnum = 0
@@ -736,7 +738,7 @@ function! vimwiki#base#check_links() "{{{
   let links_of_files = {}
   let errors = []
   for idx in range(len(g:vimwiki_list))
-    let syntax = VimwikiGet('syntax', idx)
+    let syntax = vimwiki#vars#get_wikilocal('syntax', idx)
     let wikifiles = vimwiki#base#find_files(idx, 0)
     for wikifile in wikifiles
       let links_of_files[wikifile] = s:get_links(wikifile, idx)
@@ -1222,15 +1224,15 @@ endfunction " }}}
 " vimwiki#base#follow_link
 function! vimwiki#base#follow_link(split, ...) "{{{ Parse link at cursor and pass 
   " to VimwikiLinkHandler, or failing that, the default open_link handler
-  if exists('*vimwiki#'.VimwikiGet('syntax').'_base#follow_link')
+  if exists('*vimwiki#'.vimwiki#vars#get_wikilocal('syntax').'_base#follow_link')
     " Syntax-specific links
     " XXX: @Stuart: do we still need it?
     " XXX: @Maxim: most likely!  I am still working on a seemless way to
     " integrate regexp's without complicating syntax/vimwiki.vim
     if a:0
-      call vimwiki#{VimwikiGet('syntax')}_base#follow_link(a:split, a:1)
+      call vimwiki#{vimwiki#vars#get_wikilocal('syntax')}_base#follow_link(a:split, a:1)
     else
-      call vimwiki#{VimwikiGet('syntax')}_base#follow_link(a:split)
+      call vimwiki#{vimwiki#vars#get_wikilocal('syntax')}_base#follow_link(a:split)
     endif
   else
     if a:split ==# "split"
@@ -1987,9 +1989,9 @@ endfunction " }}}
 
 " vimwiki#base#normalize_link
 function! vimwiki#base#normalize_link(is_visual_mode) "{{{
-  if exists('*vimwiki#'.VimwikiGet('syntax').'_base#normalize_link')
+  if exists('*vimwiki#'.vimwiki#vars#get_wikilocal('syntax').'_base#normalize_link')
     " Syntax-specific links
-    call vimwiki#{VimwikiGet('syntax')}_base#normalize_link(a:is_visual_mode)
+    call vimwiki#{vimwiki#vars#get_wikilocal('syntax')}_base#normalize_link(a:is_visual_mode)
   else
     if !a:is_visual_mode
       call s:normalize_link_syntax_n()
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 109965e..17f64f1 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -26,7 +26,7 @@ function! s:root_path(subdir) "{{{
 endfunction "}}}
 
 function! s:syntax_supported() " {{{
-  return VimwikiGet('syntax') ==? "default"
+  return vimwiki#vars#get_wikilocal('syntax') ==? "default"
 endfunction " }}}
 
 function! s:remove_blank_lines(lines) " {{{
@@ -1356,7 +1356,7 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
   call vimwiki#path#mkdir(a:path)
   echomsg system(vimwiki#vars#get_wikilocal('custom_wiki2html'). ' '.
       \ a:force. ' '.
-      \ VimwikiGet('syntax'). ' '.
+      \ vimwiki#vars#get_wikilocal('syntax'). ' '.
       \ strpart(vimwiki#vars#get_wikilocal('ext'), 1). ' '.
       \ shellescape(a:path). ' '.
       \ shellescape(a:wikifile). ' '.
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 7ae8d43..65ad2b6 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -188,7 +188,7 @@ function! s:get_level(lnum) "{{{
   if getline(a:lnum) =~# '^\s*$'
     return 0
   endif
-  if VimwikiGet('syntax') !=? 'media'
+  if vimwiki#vars#get_wikilocal('syntax') !=? 'media'
     let level = indent(a:lnum)
   else
     let level = s:string_length(matchstr(getline(a:lnum), s:rx_bullet_chars))-1
@@ -922,7 +922,7 @@ endfunction "}}}
 
 function! s:decrease_level(item) "{{{
   let removed_indent = 0
-  if VimwikiGet('syntax') ==? 'media' && a:item.type == 1 &&
+  if vimwiki#vars#get_wikilocal('syntax') ==? 'media' && a:item.type == 1 &&
         \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
     if s:string_length(a:item.mrkr) >= 2
       call s:substitute_string_in_line(a:item.lnum,
@@ -944,7 +944,7 @@ endfunction "}}}
 
 function! s:increase_level(item) "{{{
   let additional_indent = 0
-  if VimwikiGet('syntax') ==? 'media' && a:item.type == 1 &&
+  if vimwiki#vars#get_wikilocal('syntax') ==? 'media' && a:item.type == 1 &&
         \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
     call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:item.mrkr .
           \ s:first_char(a:item.mrkr))
@@ -966,7 +966,7 @@ endfunction "}}}
 "a:indent_by can be negative
 function! s:indent_line_by(lnum, indent_by) "{{{
   let item = s:get_item(a:lnum)
-  if VimwikiGet('syntax') ==? 'media' && item.type == 1 &&
+  if vimwiki#vars#get_wikilocal('syntax') ==? 'media' && item.type == 1 &&
         \ index(s:multiple_bullet_chars, s:first_char(item.mrkr)) > -1
     if a:indent_by > 0
       call s:substitute_string_in_line(a:lnum, item.mrkr,
@@ -1112,7 +1112,7 @@ endfunction "}}}
 function! s:set_new_mrkr(item, new_mrkr) "{{{
   if a:item.type == 0
     call s:substitute_rx_in_line(a:item.lnum, '^\s*\zs\ze', a:new_mrkr.' ')
-    if indent(a:item.lnum) == 0 && VimwikiGet('syntax') !=? 'media'
+    if indent(a:item.lnum) == 0 && vimwiki#vars#get_wikilocal('syntax') !=? 'media'
       call s:set_indent(a:item.lnum, vimwiki#lst#get_list_margin())
     endif
   else
@@ -1193,7 +1193,7 @@ endfunction "}}}
 
 "sets kind of the item depending on neighbor items and the parent item
 function! s:adjust_mrkr(item) "{{{
-  if a:item.type == 0 || VimwikiGet('syntax') ==? 'media'
+  if a:item.type == 0 || vimwiki#vars#get_wikilocal('syntax') ==? 'media'
     return
   endif
 
@@ -1223,7 +1223,7 @@ function! s:clone_marker_from_to(from, to) "{{{
   if item_from.type == 0 | return | endif
   let new_mrkr = item_from.mrkr . ' '
   call s:substitute_rx_in_line(a:to, '^\s*', new_mrkr)
-  let new_indent = ( VimwikiGet('syntax') !=? 'media' ? indent(a:from) : 0 )
+  let new_indent = ( vimwiki#vars#get_wikilocal('syntax') !=? 'media' ? indent(a:from) : 0 )
   call s:set_indent(a:to, new_indent)
   if item_from.cb != ''
     call s:create_cb(s:get_item(a:to))
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index 311c111..6a7b636 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -68,8 +68,9 @@ function! s:scan_tags(lines, page_name) "{{{
   " Code wireframe to scan for headers -- borrowed from
   " vimwiki#base#get_anchors(), with minor modifications.
 
-  let rxheader = g:vimwiki_{VimwikiGet('syntax')}_header_search
-  let rxtag = g:vimwiki_{VimwikiGet('syntax')}_tag_search
+  let syntax = vimwiki#vars#get_wikilocal('syntax')
+  let rxheader = g:vimwiki_{syntax}_header_search
+  let rxtag = g:vimwiki_{syntax}_tag_search
 
   let anchor_level = ['', '', '', '', '', '', '']
   let current_complete_anchor = ''
diff --git a/autoload/vimwiki/u.vim b/autoload/vimwiki/u.vim
index 29f53e2..fa91bf7 100644
--- a/autoload/vimwiki/u.vim
+++ b/autoload/vimwiki/u.vim
@@ -43,7 +43,7 @@ endfunction "}}}
 
 " Load concrete Wiki syntax: sets regexes and templates for headers and links
 function vimwiki#u#reload_regexes() "{{{
-  execute 'runtime! syntax/vimwiki_'.VimwikiGet('syntax').'.vim'
+  execute 'runtime! syntax/vimwiki_'.vimwiki#vars#get_wikilocal('syntax').'.vim'
 endfunction "}}}
 
 " Load omnipresent Wiki syntax
@@ -53,7 +53,7 @@ endfunction "}}}
 
 " Load syntax-specific functionality
 function vimwiki#u#reload_regexes_custom() "{{{
-  execute 'runtime! syntax/vimwiki_'.VimwikiGet('syntax').'_custom.vim'
+  execute 'runtime! syntax/vimwiki_'.vimwiki#vars#get_wikilocal('syntax').'_custom.vim'
 endfunction "}}}
 
 " Backward compatible version of the built-in function shiftwidth()
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index d9151d9..c25f681 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -228,6 +228,11 @@ function! vimwiki#vars#get_wikilocal(key, ...)
 endfunction
 
 
+function! vimwiki#vars#get_wikilocal_default(key)
+  return g:vimwiki_wikilocal_vars[-1][a:key]
+endfunction
+
+
 function! vimwiki#vars#set_wikilocal(key, value, wiki_nr)
   if a:wiki_nr == len(g:vimwiki_wikilocal_vars) - 1
     call insert(g:vimwiki_wikilocal_vars, {}, -1)
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 970bb69..eabc391 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -45,7 +45,7 @@ function! Complete_wikifiles(findstart, base)
       let s:line_context = '['
       return startoflink
     endif
-    if VimwikiGet('syntax') ==? 'markdown'
+    if vimwiki#vars#get_wikilocal('syntax') ==? 'markdown'
       let startofinlinelink = match(line, '\[.*\](\zs[^)]*$')
       if startofinlinelink != -1
         let s:line_context = '['
@@ -109,7 +109,7 @@ function! Complete_wikifiles(findstart, base)
       let given_wikifile = segments[0] == '' ? expand('%:t:r') : segments[0]
       let link_infos = vimwiki#base#resolve_link(given_wikifile.'#')
       let wikifile = link_infos.filename
-      let syntax = VimwikiGet('syntax', link_infos.index)
+      let syntax = vimwiki#vars#get_wikilocal('syntax', link_infos.index)
       let anchors = vimwiki#base#get_anchors(wikifile, syntax)
 
       let filtered_anchors = []
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 26eb8dd..8fb661d 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -86,7 +86,7 @@ function! s:setup_filetype() "{{{
   if idx == -1
     let ext = '.'.expand('%:e')
     " lookup syntax using g:vimwiki_ext2syntax
-    let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, s:vimwiki_defaults.syntax)
+    let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, vimwiki#vars#get_wikilocal_default('syntax'))
     call add(g:vimwiki_list, {'path': path, 'ext': ext, 'syntax': syn, 'temp': 1})
     let idx = len(g:vimwiki_list) - 1
     call Validate_wiki_options(idx)
@@ -119,7 +119,7 @@ function! s:setup_buffer_enter() "{{{
     if idx == -1
       let ext = '.'.expand('%:e')
       " lookup syntax using g:vimwiki_ext2syntax
-      let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, s:vimwiki_defaults.syntax)
+      let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, vimwiki#vars#get_wikilocal_default('syntax'))
       call add(g:vimwiki_list, {'path': path, 'ext': ext, 'syntax': syn, 'temp': 1})
       let idx = len(g:vimwiki_list) - 1
       call Validate_wiki_options(idx)
@@ -317,7 +317,6 @@ endif "}}}
 
 " DEFAULT wiki {{{
 let s:vimwiki_defaults = {}
-let s:vimwiki_defaults.syntax = 'default'
 
 " is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki
 " file.

From c9104fc2c171b3ec22f545830785d5acd4739bbf Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sun, 25 Dec 2016 21:35:56 +0100
Subject: [PATCH 011/108] Start refactoring the rest -- part 1

Ref #256
---
 autoload/vimwiki/base.vim |  19 ++-
 autoload/vimwiki/vars.vim |  46 ++++--
 plugin/vimwiki.vim        | 320 +++++++++++---------------------------
 3 files changed, 130 insertions(+), 255 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index b7efcb8..869c8b0 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -530,7 +530,7 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
   " if current wiki is temporary -- was added by an arbitrary wiki file then do
   " not search wiki files in subdirectories. Or it would hang the system if
   " wiki file was created in $HOME or C:/ dirs.
-  if VimwikiGet('temp', wiki_nr)
+  if vimwiki#vars#get_wikilocal('temp', wiki_nr)
     let pattern = '*'.ext
   else
     let pattern = '**/*'.ext
@@ -1290,13 +1290,13 @@ endfunction " }}}
 
 " vimwiki#base#goto_index
 function! vimwiki#base#goto_index(wnum, ...) "{{{
-  if a:wnum > len(g:vimwiki_list)
-    echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in g:vimwiki_list!'
+  if a:wnum > vimwiki#vars#number_of_wikis()
+    echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in your Vimwiki settings!'
     return
   endif
 
   " usually a:wnum is greater then 0 but with the following command it is == 0:
-  " vim -n -c "exe 'VimwikiIndex' | echo g:vimwiki_current_idx"
+  " vim -n -c ":VimwikiIndex"
   if a:wnum > 0
     let idx = a:wnum - 1
   else
@@ -1309,12 +1309,11 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
     let cmd = 'edit'
   endif
 
-  call Validate_wiki_options(idx)
-  call vimwiki#base#edit_file(cmd,
-        \ vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('index', idx).
-        \ vimwiki#vars#get_wikilocal('ext', idx),
-        \ '')
-  call vimwiki#base#setup_buffer_state(idx)
+  let index_file = vimwiki#vars#get_wikilocal('path', idx).
+        \ vimwiki#vars#get_wikilocal('index', idx).
+        \ vimwiki#vars#get_wikilocal('ext', idx)
+
+  call vimwiki#base#edit_file(cmd, index_file, '')
 endfunction "}}}
 
 " vimwiki#base#delete_link
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index c25f681..5fc07a4 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -125,17 +125,21 @@ function! s:populate_wikilocal_options()
 
   if exists('g:vimwiki_list')
     for users_options in g:vimwiki_list
-      let new_options_dict = {}
+      let new_wiki_settings = {}
       for key in keys(default_values)
         if has_key(users_options, key)
-          let new_options_dict[key] = users_options[key]
+          let new_wiki_settings[key] = users_options[key]
         elseif exists('g:vimwiki_'.key)
-          let new_options_dict[key] = g:vimwiki_{key}
+          let new_wiki_settings[key] = g:vimwiki_{key}
         else
-          let new_options_dict[key] = default_values[key]
+          let new_wiki_settings[key] = default_values[key]
         endif
       endfor
-      call add(g:vimwiki_wikilocal_vars, new_options_dict)
+
+      " is it a temporary wiki? No, it's not.
+      let new_wiki_settings.temp = 0
+
+      call add(g:vimwiki_wikilocal_vars, new_wiki_settings)
     endfor
   endif
 
@@ -148,26 +152,27 @@ function! s:populate_wikilocal_options()
       let temporary_options_dict[key] = default_values[key]
     endif
   endfor
-  call add(g:vimwiki_wikilocal_vars, default_values)
+  let temporary_options_dict.temp = 1
+  call add(g:vimwiki_wikilocal_vars, temporary_options_dict)
 
-  call s:validate_options()
+  call s:validate_settings()
 endfunction
 
 
-function! s:validate_options()
-  for options_dict in g:vimwiki_wikilocal_vars
-    let options_dict['path'] = s:normalize_path(options_dict['path'])
+function! s:validate_settings()
+  for wiki_settings in g:vimwiki_wikilocal_vars
+    let wiki_settings['path'] = s:normalize_path(wiki_settings['path'])
 
-    let path_html = options_dict['path_html']
+    let path_html = wiki_settings['path_html']
     if !empty(path_html)
-      let options_dict['path_html'] = s:normalize_path(path_html)
+      let wiki_settings['path_html'] = s:normalize_path(path_html)
     else
-      let options_dict['path_html'] = s:normalize_path(
-            \ substitute(options_dict['path'], '[/\\]\+$', '', '').'_html/')
+      let wiki_settings['path_html'] = s:normalize_path(
+            \ substitute(wiki_settings['path'], '[/\\]\+$', '', '').'_html/')
     endif
 
-    let options_dict['template_path'] =  s:normalize_path(options_dict['template_path'])
-    let options_dict['diary_rel_path'] =  s:normalize_path(options_dict['diary_rel_path'])
+    let wiki_settings['template_path'] =  s:normalize_path(wiki_settings['template_path'])
+    let wiki_settings['diary_rel_path'] =  s:normalize_path(wiki_settings['diary_rel_path'])
   endfor
 endfunction
 
@@ -241,6 +246,15 @@ function! vimwiki#vars#set_wikilocal(key, value, wiki_nr)
 endfunction
 
 
+function! vimwiki#vars#add_temporary_wiki(settings)
+  let new_temp_wiki_settings = copy(g:vimwiki_wikilocal_vars[-1])
+  for [key, value] in items(a:settings)
+    let new_temp_wiki_settings[key] = value
+  endfor
+  call insert(g:vimwiki_wikilocal_vars, new_temp_wiki_settings, -1)
+  call s:validate_settings()
+endfunction
+
 " number of registered wikis + temporary
 function! vimwiki#vars#number_of_wikis()
   return len(g:vimwiki_wikilocal_vars) - 1
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 8fb661d..4a63296 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -12,127 +12,79 @@ let s:old_cpo = &cpo
 set cpo&vim
 
 
-" HELPER functions {{{
-function! s:default(varname, value) "{{{
-  if !exists('g:vimwiki_'.a:varname)
-    let g:vimwiki_{a:varname} = a:value
-  endif
-endfunction "}}}
-
-function! s:path_html(idx) "{{{
-  let path_html = vimwiki#vars#get_wikilocal('path_html', a:idx)
-  if !empty(path_html)
-    return path_html
-  else
-    let path = vimwiki#vars#get_wikilocal('path', a:idx)
-    return substitute(path, '[/\\]\+$', '', '').'_html/'
-  endif
-endfunction "}}}
-
-function! s:normalize_path(path) "{{{
-  " resolve doesn't work quite right with symlinks ended with / or \
-  let path = substitute(a:path, '[/\\]\+$', '', '')
-  if path !~# '^scp:'
-    return resolve(expand(path)).'/'
-  else
-    return path.'/'
-  endif
-endfunction "}}}
-
-function! Validate_wiki_options(idx) " {{{
-  call vimwiki#vars#set_wikilocal('path', s:normalize_path(vimwiki#vars#get_wikilocal('path', a:idx)), a:idx)
-  call vimwiki#vars#set_wikilocal('path_html', s:normalize_path(s:path_html(a:idx)), a:idx)
-  call vimwiki#vars#set_wikilocal('template_path',
-        \ s:normalize_path(vimwiki#vars#get_wikilocal('template_path', a:idx)), a:idx)
-  call vimwiki#vars#set_wikilocal('diary_rel_path',
-        \ s:normalize_path(vimwiki#vars#get_wikilocal('diary_rel_path', a:idx)), a:idx)
-endfunction " }}}
-
-function! s:vimwiki_idx() " {{{
-  if exists('b:vimwiki_idx')
-    return b:vimwiki_idx
-  else
-    return -1
-  endif
-endfunction " }}}
-
+" this is called when the cursor leaves the buffer
 function! s:setup_buffer_leave() "{{{
-  if &filetype ==? 'vimwiki'
-    " cache global vars of current state XXX: SLOW!?
-    call vimwiki#base#cache_buffer_state()
+  " don't do anything if it's not managed by Vimwiki (that is, when it's not in
+  " a registered wiki and not a temporary wiki)
+  if vimwiki#vars#get_buffer_var('wiki_nr') == -1
+    return
   endif
 
-  let &autowriteall = s:vimwiki_autowriteall
+  let &autowriteall = s:vimwiki_autowriteall_saved
 
-  " Set up menu
   if vimwiki#vars#get_global('menu') != ""
     exe 'nmenu disable '.vimwiki#vars#get_global('menu').'.Table'
   endif
 endfunction "}}}
 
-function! s:setup_filetype() "{{{
-  " Find what wiki current buffer belongs to.
+
+" create a new temporary wiki for the current buffer
+function! s:create_temporary_wiki()
   let path = expand('%:p:h')
-  let idx = vimwiki#base#find_wiki(path)
+  let ext = '.'.expand('%:e')
 
-  if idx == -1 && vimwiki#vars#get_global('global_ext') == 0
-    return
+  let syntax_mapping = vimwiki#vars#get_global('ext2syntax')
+  if has_key(syntax_mapping, ext)
+    let syntax = syntax_mapping[ext]
+  else
+    let syntax = vimwiki#vars#get_wikilocal_default('syntax')
   endif
-  "XXX when idx = -1? (an orphan page has been detected)
 
-  "TODO: refactor (same code in setup_buffer_enter)
-  " The buffer's file is not in the path and user *does* want his wiki
-  " extension(s) to be global -- Add new wiki.
-  if idx == -1
-    let ext = '.'.expand('%:e')
-    " lookup syntax using g:vimwiki_ext2syntax
-    let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, vimwiki#vars#get_wikilocal_default('syntax'))
-    call add(g:vimwiki_list, {'path': path, 'ext': ext, 'syntax': syn, 'temp': 1})
-    let idx = len(g:vimwiki_list) - 1
-    call Validate_wiki_options(idx)
-  endif
-  " initialize and cache global vars of current state
-  call vimwiki#base#setup_buffer_state(idx)
+  let new_temp_wiki_settings = {'path': path,
+        \ 'ext': ext,
+        \ 'syntax': syntax,
+        \ }
 
-  unlet! b:vimwiki_fs_rescan
-  set filetype=vimwiki
-endfunction "}}}
+  call vimwiki#vars#add_temporary_wiki(new_temp_wiki_settings)
+endfunction
 
-function! s:setup_buffer_enter() "{{{
-  if !vimwiki#base#recall_buffer_state()
-    " Find what wiki current buffer belongs to.
-    " If wiki does not exist in g:vimwiki_list -- add new wiki there with
-    " buffer's path and ext.
-    " Else set g:vimwiki_current_idx to that wiki index.
-    let path = expand('%:p:h')
-    let idx = vimwiki#base#find_wiki(path)
 
-    " The buffer's file is not in the path and user *does NOT* want his wiki
-    " extension to be global -- Do not add new wiki.
-    if idx == -1 && vimwiki#vars#get_global('global_ext') == 0
+" this is called when Vim opens a new buffer with a known wiki extension
+function! s:setup_new_wiki_buffer() "{{{
+  let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
+  if wiki_nr == -1    " it's not in a known wiki directory
+    if vimwiki#vars#get_global('global_ext')
+      call s:create_temporary_wiki()
+    else
+      " the user does not want a temporary wiki, so do nothing
       return
     endif
-
-    "TODO: refactor (same code in setup_filetype)
-    " The buffer's file is not in the path and user *does* want his wiki
-    " extension(s) to be global -- Add new wiki.
-    if idx == -1
-      let ext = '.'.expand('%:e')
-      " lookup syntax using g:vimwiki_ext2syntax
-      let syn = get(vimwiki#vars#get_global('ext2syntax'), ext, vimwiki#vars#get_wikilocal_default('syntax'))
-      call add(g:vimwiki_list, {'path': path, 'ext': ext, 'syntax': syn, 'temp': 1})
-      let idx = len(g:vimwiki_list) - 1
-      call Validate_wiki_options(idx)
-    endif
-    " initialize and cache global vars of current state
-    call vimwiki#base#setup_buffer_state(idx)
-
   endif
 
-  " If you have
-  "     au GUIEnter * VimwikiIndex
-  " Then change it to
-  "     au GUIEnter * nested VimwikiIndex
+  " this makes that ftplugin/vimwiki.vim is sourced
+  set filetype=vimwiki
+
+  " to force a rescan of the filesystem which may have changed
+  " and update VimwikiLinks syntax group that depends on it;
+  " b:vimwiki_fs_rescan indicates that setup_filetype() has not been run
+  if exists('b:vimwiki_fs_rescan') && vimwiki#vars#get_wikilocal('maxhi')
+    set syntax=vimwiki
+  endif
+  let b:vimwiki_fs_rescan = 1
+endfunction "}}}
+
+
+" this is called when the cursor enters the buffer
+function! s:setup_buffer_enter() "{{{
+  " don't do anything if it's not managed by Vimwiki (that is, when it's not in
+  " a registered wiki and not a temporary wiki)
+  if vimwiki#vars#get_buffer_var('wiki_nr') == -1
+    return
+  endif
+
+  let s:vimwiki_autowriteall_saved = &autowriteall
+  let &autowriteall = vimwiki#vars#get_global('autowriteall')
+
   if &filetype == ''
     set filetype=vimwiki
   elseif &syntax ==? 'vimwiki'
@@ -145,23 +97,23 @@ function! s:setup_buffer_enter() "{{{
     let b:vimwiki_fs_rescan = 1
   endif
 
-  " Settings foldmethod, foldexpr and foldtext are local to window. Thus in a
-  " new tab with the same buffer folding is reset to vim defaults. So we
+  " The settings foldmethod, foldexpr and foldtext are local to window. Thus in
+  " a new tab with the same buffer folding is reset to vim defaults. So we
   " insist vimwiki folding here.
   let foldmethod = vimwiki#vars#get_global('folding')
   if foldmethod ==? 'expr'
-    setlocal fdm=expr
+    setlocal foldmethod=expr
     setlocal foldexpr=VimwikiFoldLevel(v:lnum)
     setlocal foldtext=VimwikiFoldText()
   elseif foldmethod ==? 'list' || foldmethod ==? 'lists'
-    setlocal fdm=expr
+    setlocal foldmethod=expr
     setlocal foldexpr=VimwikiFoldListLevel(v:lnum)
     setlocal foldtext=VimwikiFoldText()
   elseif foldmethod ==? 'syntax'
-    setlocal fdm=syntax
+    setlocal foldmethod=syntax
     setlocal foldtext=VimwikiFoldText()
   else
-    setlocal fdm=manual
+    setlocal foldmethod=manual
     normal! zE
   endif
 
@@ -170,23 +122,17 @@ function! s:setup_buffer_enter() "{{{
     let &conceallevel = vimwiki#vars#get_global('conceallevel')
   endif
 
+  " lcd as well
+  if vimwiki#vars#get_global('auto_chdir')
+    exe 'lcd' vimwiki#vars#get_wikilocal('path')
+  endif
+
   " Set up menu
-  if vimwiki#vars#get_global('menu') != ""
+  if vimwiki#vars#get_global('menu') !=# ''
     exe 'nmenu enable '.vimwiki#vars#get_global('menu').'.Table'
   endif
 endfunction "}}}
 
-function! s:setup_buffer_reenter() "{{{
-  if !vimwiki#base#recall_buffer_state()
-    " Do not repeat work of s:setup_buffer_enter() and s:setup_filetype()
-    " Once should be enough ...
-  endif
-  if !exists("s:vimwiki_autowriteall")
-    let s:vimwiki_autowriteall = &autowriteall
-  endif
-  let &autowriteall = vimwiki#vars#get_global('autowriteall')
-endfunction "}}}
-
 function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
   " on colorscheme change because they are not linked to Vim-predefined groups
   hi def VimwikiBold term=bold cterm=bold gui=bold
@@ -200,76 +146,6 @@ function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
   endif
 endfunction "}}}
 
-" OPTION get/set functions {{{
-" return complete list of options
-function! VimwikiGetOptionNames() "{{{
-  return keys(s:vimwiki_defaults)
-endfunction "}}}
-
-function! VimwikiGetOptions(...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-  let option_dict = {}
-  for kk in keys(s:vimwiki_defaults)
-    let option_dict[kk] = VimwikiGet(kk, idx)
-  endfor
-  return option_dict
-endfunction "}}}
-
-" Return value of option for current wiki or if second parameter exists for
-"   wiki with a given index.
-" If the option is not found, it is assumed to have been previously cached in a
-"   buffer local dictionary, that acts as a cache.
-" If the option is not found in the buffer local dictionary, an error is thrown
-function! VimwikiGet(option, ...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-
-  if has_key(g:vimwiki_list[idx], a:option)
-    let val = g:vimwiki_list[idx][a:option]
-  elseif has_key(s:vimwiki_defaults, a:option)
-    let val = s:vimwiki_defaults[a:option]
-    let g:vimwiki_list[idx][a:option] = val
-  else
-    let val = b:vimwiki_list[a:option]
-  endif
-
-  " XXX no call to vimwiki#base here or else the whole autoload/base gets loaded!
-  return val
-endfunction "}}}
-
-" Set option for current wiki or if third parameter exists for
-"   wiki with a given index.
-" If the option is not found or recognized (i.e. does not exist in
-"   s:vimwiki_defaults), it is saved in a buffer local dictionary, that acts
-"   as a cache.
-" If the option is not found in the buffer local dictionary, an error is thrown
-function! VimwikiSet(option, value, ...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-
-  if has_key(s:vimwiki_defaults, a:option) || 
-        \ has_key(g:vimwiki_list[idx], a:option)
-    let g:vimwiki_list[idx][a:option] = a:value
-  elseif exists('b:vimwiki_list')
-    let b:vimwiki_list[a:option] = a:value
-  else
-    let b:vimwiki_list = {}
-    let b:vimwiki_list[a:option] = a:value
-  endif
-
-endfunction "}}}
-
-" Clear option for current wiki or if second parameter exists for
-"   wiki with a given index.
-" Currently, only works if option was previously saved in the buffer local
-"   dictionary, that acts as a cache.
-function! VimwikiClear(option, ...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
-
-  if exists('b:vimwiki_list') && has_key(b:vimwiki_list, a:option)
-    call remove(b:vimwiki_list, a:option)
-  endif
-
-endfunction "}}}
-" }}}
 
 function! s:vimwiki_get_known_extensions() " {{{
   " Getting all extensions that different wikis could have
@@ -315,38 +191,24 @@ if !exists("*VimwikiWikiIncludeHandler") "{{{
 endif "}}}
 " CALLBACK }}}
 
-" DEFAULT wiki {{{
-let s:vimwiki_defaults = {}
-
-" is wiki temporary -- was added to g:vimwiki_list by opening arbitrary wiki
-" file.
-let s:vimwiki_defaults.temp = 0
-"}}}
-
-" DEFAULT options {{{
-call s:default('list', [s:vimwiki_defaults])
-
-call s:default('current_idx', 0)
-
-for s:idx in range(len(g:vimwiki_list))
-  call Validate_wiki_options(s:idx)
-endfor
-"}}}
 
 " AUTOCOMMANDS for all known wiki extensions {{{
 
-augroup filetypedetect
-  " clear FlexWiki's stuff
-  au! * *.wiki
-augroup end
+let s:known_extensions = s:vimwiki_get_known_extensions()
+
+if index(s:known_extensions, '.wiki') > -1
+  augroup filetypedetect
+    " clear FlexWiki's stuff
+    au! * *.wiki
+  augroup end
+endif
 
 augroup vimwiki
   autocmd!
-  for s:ext in s:vimwiki_get_known_extensions()
-    exe 'autocmd BufEnter *'.s:ext.' call s:setup_buffer_reenter()'
-    exe 'autocmd BufWinEnter *'.s:ext.' call s:setup_buffer_enter()'
-    exe 'autocmd BufLeave,BufHidden *'.s:ext.' call s:setup_buffer_leave()'
-    exe 'autocmd BufNewFile,BufRead, *'.s:ext.' call s:setup_filetype()'
+  for s:ext in s:known_extensions
+    exe 'autocmd BufEnter *'.s:ext.' call s:setup_buffer_enter()'
+    exe 'autocmd BufNewFile,BufRead *'.s:ext.' call s:setup_new_wiki_buffer()'
+    exe 'autocmd BufLeave *'.s:ext.' call s:setup_buffer_leave()'
     exe 'autocmd ColorScheme *'.s:ext.' call s:setup_cleared_syntax()'
     " Format tables when exit from insert mode. Do not use textwidth to
     " autowrap tables.
@@ -381,44 +243,46 @@ command! VimwikiDiaryGenerateLinks
 "}}}
 
 " MAPPINGS {{{
+let s:map_prefix = vimwiki#vars#get_global('map_prefix')
+
 if !hasmapto('<Plug>VimwikiIndex')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'w <Plug>VimwikiIndex'
+  exe 'nmap <silent><unique> '.s:map_prefix.'w <Plug>VimwikiIndex'
 endif
 nnoremap <unique><script> <Plug>VimwikiIndex :VimwikiIndex<CR>
 
 if !hasmapto('<Plug>VimwikiTabIndex')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'t <Plug>VimwikiTabIndex'
+  exe 'nmap <silent><unique> '.s:map_prefix.'t <Plug>VimwikiTabIndex'
 endif
 nnoremap <unique><script> <Plug>VimwikiTabIndex :VimwikiTabIndex<CR>
 
 if !hasmapto('<Plug>VimwikiUISelect')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'s <Plug>VimwikiUISelect'
+  exe 'nmap <silent><unique> '.s:map_prefix.'s <Plug>VimwikiUISelect'
 endif
 nnoremap <unique><script> <Plug>VimwikiUISelect :VimwikiUISelect<CR>
 
 if !hasmapto('<Plug>VimwikiDiaryIndex')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'i <Plug>VimwikiDiaryIndex'
+  exe 'nmap <silent><unique> '.s:map_prefix.'i <Plug>VimwikiDiaryIndex'
 endif
 nnoremap <unique><script> <Plug>VimwikiDiaryIndex :VimwikiDiaryIndex<CR>
 
 if !hasmapto('<Plug>VimwikiDiaryGenerateLinks')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>i <Plug>VimwikiDiaryGenerateLinks'
+  exe 'nmap <silent><unique> '.s:map_prefix.'<Leader>i <Plug>VimwikiDiaryGenerateLinks'
 endif
 nnoremap <unique><script> <Plug>VimwikiDiaryGenerateLinks :VimwikiDiaryGenerateLinks<CR>
 
 if !hasmapto('<Plug>VimwikiMakeDiaryNote')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>w <Plug>VimwikiMakeDiaryNote'
+  exe 'nmap <silent><unique> '.s:map_prefix.'<Leader>w <Plug>VimwikiMakeDiaryNote'
 endif
 nnoremap <unique><script> <Plug>VimwikiMakeDiaryNote :VimwikiMakeDiaryNote<CR>
 
 if !hasmapto('<Plug>VimwikiTabMakeDiaryNote')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>t <Plug>VimwikiTabMakeDiaryNote'
+  exe 'nmap <silent><unique> '.s:map_prefix.'<Leader>t <Plug>VimwikiTabMakeDiaryNote'
 endif
 nnoremap <unique><script> <Plug>VimwikiTabMakeDiaryNote
       \ :VimwikiTabMakeDiaryNote<CR>
 
 if !hasmapto('<Plug>VimwikiMakeYesterdayDiaryNote')
-  exe 'nmap <silent><unique> '.vimwiki#vars#get_global('map_prefix').'<Leader>y <Plug>VimwikiMakeYesterdayDiaryNote'
+  exe 'nmap <silent><unique> '.s:map_prefix.'<Leader>y <Plug>VimwikiMakeYesterdayDiaryNote'
 endif
 nnoremap <unique><script> <Plug>VimwikiMakeYesterdayDiaryNote
       \ :VimwikiMakeYesterdayDiaryNote<CR>
@@ -427,16 +291,14 @@ nnoremap <unique><script> <Plug>VimwikiMakeYesterdayDiaryNote
 
 " MENU {{{
 function! s:build_menu(topmenu)
-  let idx = 0
-  while idx < len(g:vimwiki_list)
+  for idx in range(vimwiki#vars#number_of_wikis())
     let norm_path = fnamemodify(vimwiki#vars#get_wikilocal('path', idx), ':h:t')
     let norm_path = escape(norm_path, '\ \.')
     execute 'menu '.a:topmenu.'.Open\ index.'.norm_path.
-          \ ' :call vimwiki#base#goto_index('.(idx + 1).')<CR>'
+          \ ' :call vimwiki#base#goto_index('.idx.')<CR>'
     execute 'menu '.a:topmenu.'.Open/Create\ diary\ note.'.norm_path.
-          \ ' :call vimwiki#diary#make_note('.(idx + 1).')<CR>'
-    let idx += 1
-  endwhile
+          \ ' :call vimwiki#diary#make_note('.idx.')<CR>'
+  endfor
 endfunction
 
 function! s:build_table_menu(topmenu)

From 7c98ce39345269e0d30f22324ec6e6ccc81f1a82 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 28 Dec 2016 22:17:08 +0100
Subject: [PATCH 012/108] Start refactoring the rest -- part 2

Ref #256
---
 autoload/vimwiki/base.vim  | 137 +++++++++----------
 autoload/vimwiki/diary.vim |   4 +-
 autoload/vimwiki/lst.vim   |  57 +-------
 autoload/vimwiki/vars.vim  | 189 ++++++++++++++++++++++++-
 ftplugin/vimwiki.vim       |   8 +-
 plugin/vimwiki.vim         |   4 +-
 syntax/vimwiki.vim         | 274 +++++++++----------------------------
 syntax/vimwiki_default.vim |  91 ++++++------
 syntax/vimwiki_media.vim   |   3 +-
 9 files changed, 378 insertions(+), 389 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 869c8b0..21a6480 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -220,8 +220,7 @@ endfunction " }}}
 " Returns: the number of the wiki a file belongs to
 function! vimwiki#base#find_wiki(path) "{{{
   let path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(a:path))
-  let idx = 0
-  while idx < len(g:vimwiki_list)
+  for idx in range(vimwiki#vars#number_of_wikis())
     let idx_path = expand(vimwiki#vars#get_wikilocal('path', idx))
     let idx_path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(idx_path))
     if vimwiki#path#is_equal(
@@ -245,7 +244,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     let source_wiki = vimwiki#base#find_wiki(a:1)
     let source_file = a:1
   else
-    let source_wiki = g:vimwiki_current_idx
+    let source_wiki = vimwiki#vars#get_bufferlocal('wiki_nr')
     let source_file = expand('%:p')
   endif
 
@@ -309,7 +308,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
   " extract the other items depending on the scheme
   if link_infos.scheme =~# '\mwiki\d\+'
     let link_infos.index = eval(matchstr(link_infos.scheme, '\D\+\zs\d\+\ze'))
-    if link_infos.index < 0 || link_infos.index >= len(g:vimwiki_list)
+    if link_infos.index < 0 || link_infos.index >= vimwiki#vars#number_of_wikis()
       let link_infos.filename = ''
       return link_infos
     endif
@@ -421,10 +420,6 @@ function! vimwiki#base#open_link(cmd, link, ...) "{{{
   if is_wiki_link
     call vimwiki#base#edit_file(a:cmd, link_infos.filename, link_infos.anchor,
           \ vimwiki_prev_link, update_prev_link)
-    if link_infos.index != g:vimwiki_current_idx
-      " this call to setup_buffer_state may not be necessary
-      call vimwiki#base#setup_buffer_state(link_infos.index)
-    endif
   else
     call vimwiki#base#system_open_link(link_infos.filename)
   endif
@@ -455,7 +450,7 @@ endfunction " }}}
 function! vimwiki#base#generate_links() "{{{
   let lines = []
 
-  let links = vimwiki#base#get_wikilinks(g:vimwiki_current_idx, 0)
+  let links = vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 0)
   call sort(links)
 
   let bullet = repeat(' ', vimwiki#lst#get_list_margin()).
@@ -464,7 +459,7 @@ function! vimwiki#base#generate_links() "{{{
     let abs_filepath = vimwiki#path#abs_path_of_link(link)
     if !s:is_diary_file(abs_filepath)
       call add(lines, bullet.
-            \ substitute(g:vimwiki_WikiLinkTemplate1, '__LinkUrl__', '\='."'".link."'", ''))
+            \ substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', '\='."'".link."'", ''))
     endif
   endfor
 
@@ -488,7 +483,7 @@ endfunction "}}}
 function! vimwiki#base#backlinks() "{{{
   let current_filename = expand("%:p")
   let locations = []
-  for idx in range(len(g:vimwiki_list))
+  for idx in range(vimwiki#vars#number_of_wikis())
     let syntax = vimwiki#vars#get_wikilocal('syntax', idx)
     let wikifiles = vimwiki#base#find_files(idx, 0)
     for source_file in wikifiles
@@ -520,7 +515,7 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
     let root_directory = vimwiki#vars#get_wikilocal('path', wiki_nr)
   else
     let root_directory = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
-    let wiki_nr = g:vimwiki_current_idx
+    let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
   endif
   if a:directories_only
     let ext = '/'
@@ -544,7 +539,7 @@ endfunction
 " If also_absolute_links is nonzero, also return links of the form /file
 function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
   let files = vimwiki#base#find_files(a:wiki_nr, 0)
-  if a:wiki_nr == g:vimwiki_current_idx
+  if a:wiki_nr == vimwiki#vars#get_bufferlocal('wiki_nr')
     let cwd = vimwiki#path#wikify_path(expand('%:p:h'))
   elseif a:wiki_nr < 0
     let cwd = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
@@ -559,7 +554,7 @@ function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
   endfor
   if a:also_absolute_links
     for wikifile in files
-      if a:wiki_nr == g:vimwiki_current_idx
+      if a:wiki_nr == vimwiki#vars#get_bufferlocal('wiki_nr')
         let cwd = vimwiki#vars#get_wikilocal('path')
       elseif a:wiki_nr < 0
         let cwd = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
@@ -575,7 +570,7 @@ endfunction
 " Returns: a list containing the links to all directories from the current file
 function! vimwiki#base#get_wiki_directories(wiki_nr)
   let dirs = vimwiki#base#find_files(a:wiki_nr, 1)
-  if a:wiki_nr == g:vimwiki_current_idx
+  if a:wiki_nr == vimwiki#vars#get_bufferlocal('wiki_nr')
     let cwd = vimwiki#path#wikify_path(expand('%:p:h'))
     let root_dir = vimwiki#vars#get_wikilocal('path')
   else
@@ -585,7 +580,7 @@ function! vimwiki#base#get_wiki_directories(wiki_nr)
   for wikidir in dirs
     let wikidir_relative = vimwiki#path#relpath(cwd, wikidir)
     call add(result, wikidir_relative)
-    if a:wiki_nr == g:vimwiki_current_idx
+    if a:wiki_nr == vimwiki#vars#get_bufferlocal('wiki_nr')
       let wikidir_absolute = '/'.vimwiki#path#relpath(root_dir, wikidir)
       call add(result, wikidir_absolute)
     endif
@@ -598,9 +593,9 @@ function! vimwiki#base#get_anchors(filename, syntax) "{{{
     return []
   endif
 
-  let rxheader = g:vimwiki_{a:syntax}_header_search
-  let rxbold = g:vimwiki_{a:syntax}_bold_search
-  let rxtag = g:vimwiki_{a:syntax}_tag_search
+  let rxheader = vimwiki#vars#get_syntaxlocal('header_search', a:syntax)
+  let rxbold = vimwiki#vars#get_syntaxlocal('bold_search', a:syntax)
+  let rxtag = vimwiki#vars#get_syntaxlocal('tag_search', a:syntax)
 
   let anchor_level = ['', '', '', '', '', '', '']
   let anchors = []
@@ -675,16 +670,16 @@ function! s:jump_to_anchor(anchor) "{{{
 
   let segments = split(anchor, '#', 0)
 
-  let current_syntax = vimwiki#vars#get_wikilocal('syntax')
-
   for segment in segments
 
     let anchor_header = substitute(
-          \ g:vimwiki_{current_syntax}_header_match,
+          \ vimwiki#vars#get_syntaxlocal('header_match'),
           \ '__Header__', "\\='".segment."'", '')
-    let anchor_bold = substitute(g:vimwiki_{current_syntax}_bold_match,
+    let anchor_bold = substitute(
+          \ vimwiki#vars#get_syntaxlocal('bold_match'),
           \ '__Text__', "\\='".segment."'", '')
-    let anchor_tag = substitute(g:vimwiki_{current_syntax}_tag_match,
+    let anchor_tag = substitute(
+          \ vimwiki#vars#get_syntaxlocal('tag_match'),
           \ '__Tag__', "\\='".segment."'", '')
 
     if         !search(anchor_tag, 'Wc')
@@ -707,7 +702,7 @@ function! s:get_links(wikifile, idx) "{{{
   endif
 
   let syntax = vimwiki#vars#get_wikilocal('syntax', a:idx)
-  let rx_link = g:vimwiki_{syntax}_wikilink
+  let rx_link = vimwiki#vars#get_syntaxlocal('wikilink', syntax)
   let links = []
   let lnum = 0
 
@@ -737,7 +732,7 @@ function! vimwiki#base#check_links() "{{{
   let anchors_of_files = {}
   let links_of_files = {}
   let errors = []
-  for idx in range(len(g:vimwiki_list))
+  for idx in range(vimwiki#vars#number_of_wikis())
     let syntax = vimwiki#vars#get_wikilocal('syntax', idx)
     let wikifiles = vimwiki#base#find_files(idx, 0)
     for wikifile in wikifiles
@@ -791,7 +786,7 @@ function! vimwiki#base#check_links() "{{{
   endfor
 
   " mark every index file as reachable
-  for idx in range(len(g:vimwiki_list))
+  for idx in range(vimwiki#vars#number_of_wikis())
     let index_file = vimwiki#vars#get_wikilocal('path', idx) . vimwiki#vars#get_wikilocal('index', idx) .
           \ vimwiki#vars#get_wikilocal('ext', idx)
     if filereadable(index_file)
@@ -936,8 +931,8 @@ endf "}}}
 " s:print_wiki_list
 function! s:print_wiki_list() "{{{
   let idx = 0
-  while idx < len(g:vimwiki_list)
-    if idx == g:vimwiki_current_idx
+  while idx < vimwiki#vars#number_of_wikis()
+    if idx == vimwiki#vars#get_bufferlocal('wiki_nr')
       let sep = ' * '
       echohl PmenuSel
     else
@@ -976,7 +971,7 @@ function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
   let new_fname = a:new_fname
 
   let old_fname_r = vimwiki#base#apply_template(
-        \ g:vimwiki_WikiLinkMatchUrlTemplate, old_fname, '', '')
+        \ vimwiki#vars#get_global('WikiLinkMatchUrlTemplate'), old_fname, '', '')
 
   let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.vimwiki#vars#get_wikilocal('ext')), '\n')
   for fname in files
@@ -1126,7 +1121,7 @@ function! vimwiki#base#update_listing_in_buffer(strings, start_header,
   let already_there = 0
 
   let header_rx = '\m^\s*'.
-        \ substitute(g:vimwiki_rxH1_Template, '__Header__', a:start_header, '')
+        \ substitute(vimwiki#vars#get_syntaxlocal('rxH1_Template'), '__Header__', a:start_header, '')
         \ .'\s*$'
 
   let start_lnum = 1
@@ -1178,7 +1173,7 @@ function! vimwiki#base#update_listing_in_buffer(strings, start_header,
 
   " write new listing
   let new_header = whitespaces_in_first_line
-        \ . substitute(g:vimwiki_rxH1_Template,
+        \ . substitute(vimwiki#vars#get_syntaxlocal('rxH1_Template'),
         \ '__Header__', '\='."'".a:start_header."'", '')
   call append(start_lnum - 1, new_header)
   let start_lnum += 1
@@ -1208,7 +1203,7 @@ endfunction "}}}
 " WIKI link following functions {{{
 " vimwiki#base#find_next_link
 function! vimwiki#base#find_next_link() "{{{
-  call vimwiki#base#search_word(g:vimwiki_rxAnyLink, '')
+  call vimwiki#base#search_word(vimwiki#vars#get_global('rxAnyLink'), '')
 endfunction " }}}
 
 " vimwiki#base#find_prev_link
@@ -1216,9 +1211,9 @@ function! vimwiki#base#find_prev_link() "{{{
   "Jump 2 times if the cursor is in the middle of a link
   if synIDattr(synID(line('.'), col('.'), 0), "name") =~# "VimwikiLink.*" &&
         \ synIDattr(synID(line('.'), col('.')-1, 0), "name") =~# "VimwikiLink.*"
-    call vimwiki#base#search_word(g:vimwiki_rxAnyLink, 'b')
+    call vimwiki#base#search_word(vimwiki#vars#get_global('rxAnyLink'), 'b')
   endif
-  call vimwiki#base#search_word(g:vimwiki_rxAnyLink, 'b')
+  call vimwiki#base#search_word(vimwiki#vars#get_global('rxAnyLink'), 'b')
 endfunction " }}}
 
 " vimwiki#base#follow_link
@@ -1246,17 +1241,17 @@ function! vimwiki#base#follow_link(split, ...) "{{{ Parse link at cursor and pas
     endif
 
     " try WikiLink
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiLink),
-          \ g:vimwiki_rxWikiLinkMatchUrl)
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiLink')),
+          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
     " try WikiIncl
     if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiIncl),
-          \ g:vimwiki_rxWikiInclMatchUrl)
+      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
+          \ vimwiki#vars#get_global('rxWikiInclMatchUrl'))
     endif
     " try Weblink
     if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWeblink),
-            \ g:vimwiki_rxWeblinkMatchUrl)
+      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink')),
+            \ vimwiki#vars#get_global('rxWeblinkMatchUrl'))
     endif
 
     if lnk != ""
@@ -1373,7 +1368,7 @@ function! vimwiki#base#rename_link() "{{{
     return
   endif
 
-  let url = matchstr(new_link, g:vimwiki_rxWikiLinkMatchUrl)
+  let url = matchstr(new_link, vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
   if url != ''
     let new_link = url
   endif
@@ -1684,15 +1679,15 @@ endfunction "}}}
 function! vimwiki#base#AddHeaderLevel() "{{{
   let lnum = line('.')
   let line = getline(lnum)
-  let rxHdr = g:vimwiki_rxH
+  let rxHdr = vimwiki#vars#get_syntaxlocal('rxH')
   if line =~# '^\s*$'
     return
   endif
 
-  if line =~# g:vimwiki_rxHeader
+  if line =~# vimwiki#vars#get_syntaxlocal('rxHeader')
     let level = vimwiki#u#count_first_sym(line)
     if level < 6
-      if g:vimwiki_symH
+      if vimwiki#vars#get_syntaxlocal('symH')
         let line = substitute(line, '\('.rxHdr.'\+\).\+\1', rxHdr.'&'.rxHdr, '')
       else
         let line = substitute(line, '\('.rxHdr.'\+\).\+', rxHdr.'&', '')
@@ -1701,7 +1696,7 @@ function! vimwiki#base#AddHeaderLevel() "{{{
     endif
   else
     let line = substitute(line, '^\s*', '&'.rxHdr.' ', '') 
-    if g:vimwiki_symH
+    if vimwiki#vars#get_syntaxlocal('symH')
       let line = substitute(line, '\s*$', ' '.rxHdr.'&', '')
     endif
     call setline(lnum, line)
@@ -1712,19 +1707,19 @@ endfunction "}}}
 function! vimwiki#base#RemoveHeaderLevel() "{{{
   let lnum = line('.')
   let line = getline(lnum)
-  let rxHdr = g:vimwiki_rxH
+  let rxHdr = vimwiki#vars#get_syntaxlocal('rxH')
   if line =~# '^\s*$'
     return
   endif
 
-  if line =~# g:vimwiki_rxHeader
+  if line =~# vimwiki#vars#get_syntaxlocal('rxHeader')
     let level = vimwiki#u#count_first_sym(line)
     let old = repeat(rxHdr, level)
     let new = repeat(rxHdr, level - 1)
 
     let chomp = line =~# rxHdr.'\s'
 
-    if g:vimwiki_symH
+    if vimwiki#vars#get_syntaxlocal('symH')
       let line = substitute(line, old, new, 'g')
     else
       let line = substitute(line, old, new, '')
@@ -1751,27 +1746,27 @@ function! vimwiki#base#table_of_contents(create)
   let headers_levels = [['', 0], ['', 0], ['', 0], ['', 0], ['', 0], ['', 0]]
   for lnum in range(1, line('$'))
     let line_content = getline(lnum)
-    if (is_inside_pre_or_math == 1 && line_content =~# g:vimwiki_rxPreEnd) ||
-          \ (is_inside_pre_or_math == 2 && line_content =~# g:vimwiki_rxMathEnd)
+    if (is_inside_pre_or_math == 1 && line_content =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')) ||
+          \ (is_inside_pre_or_math == 2 && line_content =~# vimwiki#vars#get_syntaxlocal('rxMathEnd'))
       let is_inside_pre_or_math = 0
       continue
     endif
     if is_inside_pre_or_math > 0
       continue
     endif
-    if line_content =~# g:vimwiki_rxPreStart
+    if line_content =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
       let is_inside_pre_or_math = 1
       continue
     endif
-    if line_content =~# g:vimwiki_rxMathStart
+    if line_content =~# vimwiki#vars#get_syntaxlocal('rxMathStart')
       let is_inside_pre_or_math = 2
       continue
     endif
-    if line_content !~# g:vimwiki_rxHeader
+    if line_content !~# vimwiki#vars#get_syntaxlocal('rxHeader')
       continue
     endif
     let h_level = vimwiki#u#count_first_sym(line_content)
-    let h_text = vimwiki#u#trim(matchstr(line_content, g:vimwiki_rxHeader))
+    let h_text = vimwiki#u#trim(matchstr(line_content, vimwiki#vars#get_syntaxlocal('rxHeader')))
     if h_text ==# vimwiki#vars#get_global('toc_header')  " don't include the TOC's header itself
       continue
     endif
@@ -1804,7 +1799,7 @@ function! vimwiki#base#table_of_contents(create)
   for [lvl, link, desc] in headers
     let esc_link = substitute(link, "'", "''", 'g')
     let esc_desc = substitute(desc, "'", "''", 'g')
-    let link = substitute(g:vimwiki_WikiLinkTemplate2, '__LinkUrl__',
+    let link = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__',
           \ '\='."'".'#'.esc_link."'", '')
     let link = substitute(link, '__LinkDescription__', '\='."'".esc_desc."'", '')
     call add(lines, startindent.repeat(indentstring, lvl-1).bullet.link)
@@ -1897,15 +1892,15 @@ function! s:normalize_link_in_diary(lnk) " {{{
 
   if ! link_exists_in_wiki || link_exists_in_diary || link_is_date
     let str = a:lnk
-    let rxUrl = g:vimwiki_rxWord
+    let rxUrl = vimwiki#vars#get_syntaxlocal('rxWord')
     let rxDesc = ''
-    let template = g:vimwiki_WikiLinkTemplate1
+    let template = vimwiki#vars#get_global('WikiLinkTemplate1')
   else
     let depth = len(split(vimwiki#vars#get_wikilocal('diary_rel_path'), '/'))
     let str = repeat('../', depth) . a:lnk . '|' . a:lnk
     let rxUrl = '^.*\ze|'
     let rxDesc = '|\zs.*$'
-    let template = g:vimwiki_WikiLinkTemplate2
+    let template = vimwiki#vars#get_global('WikiLinkTemplate2')
   endif
 
   return vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template)
@@ -1915,42 +1910,42 @@ endfunction " }}}
 function! s:normalize_link_syntax_n() " {{{
 
   " try WikiLink
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiLink)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiLink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ g:vimwiki_rxWikiLinkMatchUrl, g:vimwiki_rxWikiLinkMatchDescr,
-          \ g:vimwiki_WikiLinkTemplate2)
-    call vimwiki#base#replacestr_at_cursor(g:vimwiki_rxWikiLink, sub)
+          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_global('WikiLinkTemplate2'))
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_global('rxWikiLink'), sub)
     return
   endif
   
   " try WikiIncl
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiIncl)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl'))
   if !empty(lnk)
     " NO-OP !!
     return
   endif
 
   " try Weblink
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWeblink)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ lnk, '', g:vimwiki_WikiLinkTemplate2)
-    call vimwiki#base#replacestr_at_cursor(g:vimwiki_rxWeblink, sub)
+          \ lnk, '', vimwiki#vars#get_global('WikiLinkTemplate2'))
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_global('rxWeblink'), sub)
     return
   endif
 
   " try Word (any characters except separators)
   " rxWord is less permissive than rxWikiLinkUrl which is used in
   " normalize_link_syntax_v
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWord)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWord'))
   if !empty(lnk)
     if s:is_diary_file(expand("%:p"))
       let sub = s:normalize_link_in_diary(lnk)
     else
       let sub = vimwiki#base#normalize_link_helper(lnk,
-            \ g:vimwiki_rxWord, '',
-            \ g:vimwiki_WikiLinkTemplate1)
+            \ vimwiki#vars#get_syntaxlocal('rxWord'), '',
+            \ vimwiki#vars#get_global('WikiLinkTemplate1'))
     endif
     call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
     return
@@ -1973,7 +1968,7 @@ function! s:normalize_link_syntax_v() " {{{
     if s:is_diary_file(expand("%:p"))
       let sub = s:normalize_link_in_diary(@")
     else
-      let sub = substitute(g:vimwiki_WikiLinkTemplate1,
+      let sub = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
             \ '__LinkUrl__', '\=' . "'" . @" . "'", '')
     endif
 
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 609dbf3..682668f 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -159,7 +159,7 @@ endfunction "}}}
 " Diary index stuff }}}
 
 function! vimwiki#diary#make_note(wnum, ...) "{{{
-  if a:wnum > len(g:vimwiki_list)
+  if a:wnum > vimwiki#vars#number_of_wikis()
     echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in g:vimwiki_list!'
     return
   endif
@@ -189,7 +189,7 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
 endfunction "}}}
 
 function! vimwiki#diary#goto_diary_index(wnum) "{{{
-  if a:wnum > len(g:vimwiki_list)
+  if a:wnum > vimwiki#vars#number_of_wikis()
     echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in g:vimwiki_list!'
     return
   endif
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 65ad2b6..9f8ab32 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -188,7 +188,7 @@ function! s:get_level(lnum) "{{{
   if getline(a:lnum) =~# '^\s*$'
     return 0
   endif
-  if vimwiki#vars#get_wikilocal('syntax') !=? 'media'
+  if !vimwiki#vars#get_wikilocal('recurring_bullets')
     let level = indent(a:lnum)
   else
     let level = s:string_length(matchstr(getline(a:lnum), s:rx_bullet_chars))-1
@@ -922,7 +922,7 @@ endfunction "}}}
 
 function! s:decrease_level(item) "{{{
   let removed_indent = 0
-  if vimwiki#vars#get_wikilocal('syntax') ==? 'media' && a:item.type == 1 &&
+  if vimwiki#vars#get_wikilocal('recurring_bullets') && a:item.type == 1 &&
         \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
     if s:string_length(a:item.mrkr) >= 2
       call s:substitute_string_in_line(a:item.lnum,
@@ -944,7 +944,7 @@ endfunction "}}}
 
 function! s:increase_level(item) "{{{
   let additional_indent = 0
-  if vimwiki#vars#get_wikilocal('syntax') ==? 'media' && a:item.type == 1 &&
+  if vimwiki#vars#get_wikilocal('recurring_bullets') && a:item.type == 1 &&
         \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
     call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:item.mrkr .
           \ s:first_char(a:item.mrkr))
@@ -966,7 +966,7 @@ endfunction "}}}
 "a:indent_by can be negative
 function! s:indent_line_by(lnum, indent_by) "{{{
   let item = s:get_item(a:lnum)
-  if vimwiki#vars#get_wikilocal('syntax') ==? 'media' && item.type == 1 &&
+  if vimwiki#vars#get_wikilocal('recurring_bullets') && item.type == 1 &&
         \ index(s:multiple_bullet_chars, s:first_char(item.mrkr)) > -1
     if a:indent_by > 0
       call s:substitute_string_in_line(a:lnum, item.mrkr,
@@ -1112,7 +1112,7 @@ endfunction "}}}
 function! s:set_new_mrkr(item, new_mrkr) "{{{
   if a:item.type == 0
     call s:substitute_rx_in_line(a:item.lnum, '^\s*\zs\ze', a:new_mrkr.' ')
-    if indent(a:item.lnum) == 0 && vimwiki#vars#get_wikilocal('syntax') !=? 'media'
+    if indent(a:item.lnum) == 0 && !vimwiki#vars#get_wikilocal('recurring_bullets')
       call s:set_indent(a:item.lnum, vimwiki#lst#get_list_margin())
     endif
   else
@@ -1193,7 +1193,7 @@ endfunction "}}}
 
 "sets kind of the item depending on neighbor items and the parent item
 function! s:adjust_mrkr(item) "{{{
-  if a:item.type == 0 || vimwiki#vars#get_wikilocal('syntax') ==? 'media'
+  if a:item.type == 0 || vimwiki#vars#get_wikilocal('recurring_bullets')
     return
   endif
 
@@ -1223,7 +1223,7 @@ function! s:clone_marker_from_to(from, to) "{{{
   if item_from.type == 0 | return | endif
   let new_mrkr = item_from.mrkr . ' '
   call s:substitute_rx_in_line(a:to, '^\s*', new_mrkr)
-  let new_indent = ( vimwiki#vars#get_wikilocal('syntax') !=? 'media' ? indent(a:from) : 0 )
+  let new_indent = ( vimwiki#vars#get_wikilocal('recurring_bullets') ? 0 : indent(a:from) )
   call s:set_indent(a:to, new_indent)
   if item_from.cb != ''
     call s:create_cb(s:get_item(a:to))
@@ -1460,49 +1460,6 @@ endfunction "}}}
 "handle keys }}}
 
 "misc stuff {{{
-function! vimwiki#lst#setup_marker_infos() "{{{
-  let s:rx_bullet_chars = '['.join(keys(g:vimwiki_bullet_types), '').']\+'
-
-  let s:multiple_bullet_chars = []
-  for i in keys(g:vimwiki_bullet_types)
-    if g:vimwiki_bullet_types[i] == 1
-      call add(s:multiple_bullet_chars, i)
-    endif
-  endfor
-
-  let s:number_kinds = []
-  let s:number_divisors = ""
-  for i in g:vimwiki_number_types
-    call add(s:number_kinds, i[0])
-    let s:number_divisors .= vimwiki#u#escape(i[1])
-  endfor
-
-  let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
-        \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
-
-  "create regexp for bulleted list items
-  let g:vimwiki_rxListBullet = join( map(keys(g:vimwiki_bullet_types),
-        \'vimwiki#u#escape(v:val).repeat("\\+", g:vimwiki_bullet_types[v:val])'
-        \ ) , '\|')
-
-  "create regex for numbered list items
-  if !empty(g:vimwiki_number_types)
-    let g:vimwiki_rxListNumber = '\C\%('
-    for type in g:vimwiki_number_types[:-2]
-      let g:vimwiki_rxListNumber .= s:char_to_rx[type[0]] .
-            \ vimwiki#u#escape(type[1]) . '\|'
-    endfor
-    let g:vimwiki_rxListNumber .= s:char_to_rx[g:vimwiki_number_types[-1][0]].
-          \ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
-  else
-    "regex that matches nothing
-    let g:vimwiki_rxListNumber = '$^'
-  endif
-
-  "the user can set the listsyms as string, but vimwiki needs a list
-  let g:vimwiki_listsyms_list = split(vimwiki#vars#get_global('listsyms'), '\zs')
-endfunction "}}}
-
 function! vimwiki#lst#TO_list_item(inner, visual) "{{{
   let lnum = prevnonblank('.')
   let item = s:get_corresponding_item(lnum)
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 5fc07a4..d6438f4 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -80,6 +80,106 @@ function! s:populate_global_variables()
         \ '\)'
 
   let g:vimwiki_global_vars['rxWeblinkUrl'] = rxWebProtocols . '\S\{-1,}'. '\%(([^ \t()]*)\)\='
+
+  let wikilink_prefix = '[['
+  let wikilink_suffix = ']]'
+  let wikilink_separator = '|'
+  let g:vimwiki_global_vars.rx_wikilink_prefix = vimwiki#u#escape(wikilink_prefix)
+  let g:vimwiki_global_vars.rx_wikilink_suffix = vimwiki#u#escape(wikilink_suffix)
+  let g:vimwiki_global_vars.rx_wikilink_separator = vimwiki#u#escape(wikilink_separator)
+
+  " templates for the creation of wiki links
+  " [[URL]]
+  let g:vimwiki_global_vars.WikiLinkTemplate1 = wikilink_prefix . '__LinkUrl__'. wikilink_suffix
+  " [[URL|DESCRIPTION]]
+  let g:vimwiki_global_vars.WikiLinkTemplate2 = wikilink_prefix . '__LinkUrl__'. wikilink_separator
+        \ . '__LinkDescription__' . wikilink_suffix
+
+  " template for matching all wiki links with a given target file
+  let g:vimwiki_global_vars.WikiLinkMatchUrlTemplate =
+        \ g:vimwiki_global_vars.rx_wikilink_prefix .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+        \ g:vimwiki_global_vars.rx_wikilink_suffix .
+        \ '\|' .
+        \ g:vimwiki_global_vars.rx_wikilink_prefix .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+        \ g:vimwiki_global_vars.rx_wikilink_separator .
+        \ '.*' .
+        \ g:vimwiki_global_vars.rx_wikilink_suffix
+
+  let valid_chars = '[^\\\]]'
+  let g:vimwiki_global_vars.rxWikiLinkUrl = valid_chars.'\{-}'
+  let g:vimwiki_global_vars.rxWikiLinkDescr = valid_chars.'\{-}'
+
+  " this regexp defines what can form a link when the user presses <CR> in the
+  " buffer (and not on a link) to create a link
+  " basically, it's Ascii alphanumeric characters plus #|./@-_~ plus all
+  " non-Ascii characters
+  let g:vimwiki_global_vars.rxWord = '[^[:blank:]!"$%&''()*+,:;<=>?\[\]\\^`{}]\+'
+
+  " [[URL]], or [[URL|DESCRIPTION]]
+  " a) match [[URL|DESCRIPTION]]
+  let g:vimwiki_global_vars.rxWikiLink = g:vimwiki_global_vars.rx_wikilink_prefix.
+        \ g:vimwiki_global_vars.rxWikiLinkUrl.'\%('.g:vimwiki_global_vars.rx_wikilink_separator.
+        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
+  " b) match URL within [[URL|DESCRIPTION]]
+  let g:vimwiki_global_vars.rxWikiLinkMatchUrl = g:vimwiki_global_vars.rx_wikilink_prefix.
+        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkUrl.'\ze\%('. g:vimwiki_global_vars.rx_wikilink_separator.
+        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
+  " c) match DESCRIPTION within [[URL|DESCRIPTION]]
+  let g:vimwiki_global_vars.rxWikiLinkMatchDescr = g:vimwiki_global_vars.rx_wikilink_prefix.
+        \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator.'\%('.
+        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkDescr. '\ze\)\?'. g:vimwiki_global_vars.rx_wikilink_suffix
+
+  let rx_wikilink_prefix1 = g:vimwiki_global_vars.rx_wikilink_prefix . g:vimwiki_global_vars.rxWikiLinkUrl .
+        \ g:vimwiki_global_vars.rx_wikilink_separator
+  let rx_wikilink_suffix1 = g:vimwiki_global_vars.rx_wikilink_suffix
+
+  let g:vimwiki_global_vars.rxWikiInclPrefix = '{{'
+  let g:vimwiki_global_vars.rxWikiInclSuffix = '}}'
+  let g:vimwiki_global_vars.rxWikiInclSeparator = '|'
+  " '{{__LinkUrl__}}'
+  let g:vimwiki_global_vars.WikiInclTemplate1 = g:vimwiki_global_vars.rxWikiInclPrefix . '__LinkUrl__'.
+        \ g:vimwiki_global_vars.rxWikiInclSuffix
+  " '{{__LinkUrl____LinkDescription__}}'
+  let g:vimwiki_global_vars.WikiInclTemplate2 = g:vimwiki_global_vars.rxWikiInclPrefix . '__LinkUrl__'.
+        \ '__LinkDescription__'.
+        \ g:vimwiki_global_vars.rxWikiInclSuffix
+
+  let valid_chars = '[^\\\}]'
+  let g:vimwiki_global_vars.rxWikiInclUrl = valid_chars.'\{-}'
+  let g:vimwiki_global_vars.rxWikiInclArg = valid_chars.'\{-}'
+  let g:vimwiki_global_vars.rxWikiInclArgs = '\%('. g:vimwiki_global_vars.rxWikiInclSeparator.
+        \ g:vimwiki_global_vars.rxWikiInclArg. '\)'.'\{-}'
+
+  " *. {{URL}[{...}]}  - i.e.  {{URL}}, {{URL|ARG1}}, {{URL|ARG1|ARG2}}, etc.
+  " *a) match {{URL}[{...}]}
+  let g:vimwiki_global_vars.rxWikiIncl = g:vimwiki_global_vars.rxWikiInclPrefix.
+        \ g:vimwiki_global_vars.rxWikiInclUrl.
+        \ g:vimwiki_global_vars.rxWikiInclArgs. g:vimwiki_global_vars.rxWikiInclSuffix
+  " *b) match URL within {{URL}[{...}]}
+  let g:vimwiki_global_vars.rxWikiInclMatchUrl = g:vimwiki_global_vars.rxWikiInclPrefix.
+        \ '\zs'. g:vimwiki_global_vars.rxWikiInclUrl . '\ze'.
+        \ g:vimwiki_global_vars.rxWikiInclArgs . g:vimwiki_global_vars.rxWikiInclSuffix
+
+  let g:vimwiki_global_vars.rxWikiInclPrefix1 = g:vimwiki_global_vars.rxWikiInclPrefix.
+        \ g:vimwiki_global_vars.rxWikiInclUrl . g:vimwiki_global_vars.rxWikiInclSeparator
+  let g:vimwiki_global_vars.rxWikiInclSuffix1 = g:vimwiki_global_vars.rxWikiInclArgs.
+        \ g:vimwiki_global_vars.rxWikiInclSuffix
+
+  " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
+  " let g:vimwiki_rxWeblink = '[\["(|]\@<!'. g:vimwiki_rxWeblinkUrl .
+  " \ '\%([),:;.!?]\=\%([ \t]\|$\)\)\@='
+  let g:vimwiki_global_vars.rxWeblink = '\<'. g:vimwiki_global_vars.rxWeblinkUrl . '\S*'
+  " 0a) match URL within URL
+  let g:vimwiki_global_vars.rxWeblinkMatchUrl = g:vimwiki_global_vars.rxWeblink
+  " 0b) match DESCRIPTION within URL
+  let g:vimwiki_global_vars.rxWeblinkMatchDescr = ''
+
+  let g:vimwiki_global_vars.rxAnyLink = g:vimwiki_global_vars.rxWikiLink.'\|'.
+      \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_global_vars.rxWeblink
+
+  let g:vimwiki_global_vars.rxTodo = '\C\%(TODO:\|DONE:\|STARTED:\|FIXME:\|FIXED:\|XXX:\)'
 endfunction
 
 
@@ -177,11 +277,83 @@ function! s:validate_settings()
 endfunction
 
 
-" TODO
-function! s:populate_syntax_vars(syntax)
+function! vimwiki#vars#populate_syntax_vars(syntax)
   if !exists('g:vimwiki_syntax_variables')
     let g:vimwiki_syntax_variables = {}
   endif
+  if !has_key(g:vimwiki_syntax_variables, a:syntax)
+    let g:vimwiki_syntax_variables[a:syntax] = {}
+  endif
+
+  execute 'runtime! syntax/vimwiki_'.a:syntax.'.vim'
+
+  " generic stuff
+  let header_symbol = g:vimwiki_syntax_variables[a:syntax].rxH
+  if g:vimwiki_syntax_variables[a:syntax].symH
+    " symmetric headers
+    for i in range(1,6)
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Template = repeat(header_symbol, i).' __Header__ '.repeat(header_symbol, i)
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i} = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Start = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_End = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{1,'.i.'}\s*$'
+    endfor
+    let g:vimwiki_syntax_variables[a:syntax].rxHeader = '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*[^'.header_symbol.']\ze\1\s*$'
+  else
+    " asymmetric
+    for i in range(1,6)
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Template = repeat(header_symbol, i).' __Header__'
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i} = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Start = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_End = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*$'
+    endfor
+    let g:vimwiki_syntax_variables[a:syntax].rxHeader = '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*\ze$'
+  endif
+
+  let g:vimwiki_syntax_variables[a:syntax].rxPreStart = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreStart
+  let g:vimwiki_rxPreEnd = '^\s*'.g:vimwiki_rxPreEnd.'\s*$'
+
+  let g:vimwiki_rxMathStart = '^\s*'.g:vimwiki_rxMathStart
+  let g:vimwiki_rxMathEnd = '^\s*'.g:vimwiki_rxMathEnd.'\s*$'
+
+  " list stuff
+  let rx_bullet_chars = '['.join(g:vimwiki_syntax_variables[a:syntax].bullet_types, '').']\+'
+
+  let g:vimwiki_syntax_variables[a:syntax].multiple_bullet_chars = g:vimwiki_syntax_variables[a:syntax].recurring_bullets ? g:vimwiki_syntax_variables[a:syntax].bullet_types : []
+
+  let s:number_kinds = []
+  let s:number_divisors = ""
+  for i in g:vimwiki_number_types
+    call add(s:number_kinds, i[0])
+    let s:number_divisors .= vimwiki#u#escape(i[1])
+  endfor
+
+  let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
+        \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
+
+  "create regexp for bulleted list items
+  let g:vimwiki_rxListBullet = join( map(keys(bullet_types),
+        \'vimwiki#u#escape(v:val).repeat("\\+", bullet_types[v:val])'
+        \ ) , '\|')
+
+  "create regex for numbered list items
+  if !empty(g:vimwiki_number_types)
+    let g:vimwiki_rxListNumber = '\C\%('
+    for type in g:vimwiki_number_types[:-2]
+      let g:vimwiki_rxListNumber .= s:char_to_rx[type[0]] .
+            \ vimwiki#u#escape(type[1]) . '\|'
+    endfor
+    let g:vimwiki_rxListNumber .= s:char_to_rx[g:vimwiki_number_types[-1][0]].
+          \ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
+  else
+    "regex that matches nothing
+    let g:vimwiki_rxListNumber = '$^'
+  endif
+
+  "the user can set the listsyms as string, but vimwiki needs a list
+  let g:vimwiki_listsyms_list = split(vimwiki#vars#get_global('listsyms'), '\zs')
+  let s:default_syntax.rxListItemWithoutCB = '^\s*\%(\('.s:default_syntax.rxListBullet.'\)\|\('.s:default_syntax.rxListNumber.'\)\)\s'
+  let s:default_syntax.rxListItem = s:default_syntax.rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
+  let s:default_syntax.rxListItemAndChildren = '^\(\s*\)\%('.s:default_syntax.rxListBullet.'\|'.s:default_syntax.rxListNumber.'\)\s\+\['.s:default_syntax.listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
 endfunction
 
 
@@ -191,12 +363,17 @@ function! vimwiki#vars#init()
 endfunction
 
 
-function! vimwiki#vars#get_syntaxlocal(syntax, key)
-  if !exists('g:vimwiki_syntax_variables') || !has_key(g:vimwiki_syntax_variables, a:syntax)
-    call s:populate_syntax_vars(a:syntax)
+function! vimwiki#vars#get_syntaxlocal(key, ...)
+  if a:0
+    let syntax = a:1
+  else
+    let syntax = vimwiki#vars#get_wikilocal('syntax')
+  endif
+  if !exists('g:vimwiki_syntax_variables') || !has_key(g:vimwiki_syntax_variables, syntax)
+    call vimwiki#vars#populate_syntax_vars(syntax)
   endif
 
-  return g:vimwiki_syntax_variables[a:syntax][a:key]
+  return g:vimwiki_syntax_variables[syntax][a:key]
 endfunction
 
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index eabc391..67e65a6 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -7,8 +7,6 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1  " Don't load another plugin for this buffer
 
-call vimwiki#u#reload_regexes()
-call vimwiki#u#reload_omni_regexes()
 
 " UNDO list {{{
 " Reset the following options to undo this plugin.
@@ -78,7 +76,7 @@ function! Complete_wikifiles(findstart, base)
 
       if a:base =~# '^wiki\d:'
         let wikinumber = eval(matchstr(a:base, '^wiki\zs\d'))
-        if wikinumber >= len(g:vimwiki_list)
+        if wikinumber >= vimwiki#vars#number_of_wikis()
           return []
         endif
         let prefix = matchstr(a:base, '^wiki\d:\zs.*')
@@ -141,7 +139,7 @@ setlocal formatoptions-=2
 setlocal formatoptions+=n
 
 "Create 'formatlistpat'
-let &formatlistpat = g:vimwiki_rxListItem
+let &formatlistpat = vimwiki#vars#get_syntaxlocal('rxListItem')
 
 if !empty(&langmap)
   " Valid only if langmap is a comma separated pairs of chars
@@ -532,7 +530,7 @@ endif
 noremap <silent><script><buffer>
     \ <Plug>VimwikiRemoveCBInList :VimwikiRemoveCBInList<CR>
 
-for s:char in keys(g:vimwiki_bullet_types)
+for s:char in keys(vimwiki#vars#get_syntaxlocal('bullet_types'))
   if !hasmapto(':VimwikiChangeSymbolTo '.s:char.'<CR>')
     exe 'noremap <silent><buffer> gl'.s:char.' :VimwikiChangeSymbolTo '.s:char.'<CR>'
   endif
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 4a63296..900221d 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -16,7 +16,7 @@ set cpo&vim
 function! s:setup_buffer_leave() "{{{
   " don't do anything if it's not managed by Vimwiki (that is, when it's not in
   " a registered wiki and not a temporary wiki)
-  if vimwiki#vars#get_buffer_var('wiki_nr') == -1
+  if vimwiki#vars#get_bufferlocal('wiki_nr') == -1
     return
   endif
 
@@ -78,7 +78,7 @@ endfunction "}}}
 function! s:setup_buffer_enter() "{{{
   " don't do anything if it's not managed by Vimwiki (that is, when it's not in
   " a registered wiki and not a temporary wiki)
-  if vimwiki#vars#get_buffer_var('wiki_nr') == -1
+  if vimwiki#vars#get_bufferlocal('wiki_nr') == -1
     return
   endif
 
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 62f06b2..074a666 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -17,134 +17,10 @@ if vimwiki#vars#get_wikilocal('maxhi')
         \ vimwiki#base#get_wiki_directories(g:vimwiki_current_idx)
 endif
 
+let s:current_syntax = vimwiki#vars#get_wikilocal('syntax')
 
-call vimwiki#u#reload_regexes()
+call vimwiki#vars#populate_syntax_vars(s:current_syntax)
 
-" LINKS: setup of larger regexes {{{
-
-" LINKS: setup wikilink regexps {{{
-let s:wikilink_prefix = '[['
-let s:wikilink_suffix = ']]'
-let s:wikilink_separator = '|'
-let s:rx_wikilink_prefix = vimwiki#u#escape(s:wikilink_prefix)
-let s:rx_wikilink_suffix = vimwiki#u#escape(s:wikilink_suffix)
-let s:rx_wikilink_separator = vimwiki#u#escape(s:wikilink_separator)
-
-" templates for the creation of wiki links
-" [[URL]]
-let g:vimwiki_WikiLinkTemplate1 = s:wikilink_prefix . '__LinkUrl__'.
-      \ s:wikilink_suffix
-" [[URL|DESCRIPTION]]
-let g:vimwiki_WikiLinkTemplate2 = s:wikilink_prefix . '__LinkUrl__'.
-      \ s:wikilink_separator . '__LinkDescription__' . s:wikilink_suffix
-
-" template for matching all wiki links with a given target file
-let g:vimwiki_WikiLinkMatchUrlTemplate =
-      \ s:rx_wikilink_prefix .
-      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-      \ s:rx_wikilink_suffix .
-      \ '\|' .
-      \ s:rx_wikilink_prefix .
-      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-      \ s:rx_wikilink_separator .
-      \ '.*' .
-      \ s:rx_wikilink_suffix
-
-let s:valid_chars = '[^\\\]]'
-let g:vimwiki_rxWikiLinkUrl = s:valid_chars.'\{-}'
-let g:vimwiki_rxWikiLinkDescr = s:valid_chars.'\{-}'
-
-" this regexp defines what can form a link when the user presses <CR> in the
-" buffer (and not on a link) to create a link
-" basically, it's Ascii alphanumeric characters plus #|./@-_~ plus all
-" non-Ascii characters
-let g:vimwiki_rxWord = '[^[:blank:]!"$%&''()*+,:;<=>?\[\]\\^`{}]\+'
-
-
-" [[URL]], or [[URL|DESCRIPTION]]
-" a) match [[URL|DESCRIPTION]]
-let g:vimwiki_rxWikiLink = s:rx_wikilink_prefix.
-      \ g:vimwiki_rxWikiLinkUrl.'\%('.s:rx_wikilink_separator.
-      \ g:vimwiki_rxWikiLinkDescr.'\)\?'.s:rx_wikilink_suffix
-" b) match URL within [[URL|DESCRIPTION]]
-let g:vimwiki_rxWikiLinkMatchUrl = s:rx_wikilink_prefix.
-      \ '\zs'. g:vimwiki_rxWikiLinkUrl.'\ze\%('. s:rx_wikilink_separator.
-      \ g:vimwiki_rxWikiLinkDescr.'\)\?'.s:rx_wikilink_suffix
-" c) match DESCRIPTION within [[URL|DESCRIPTION]]
-let g:vimwiki_rxWikiLinkMatchDescr = s:rx_wikilink_prefix.
-      \ g:vimwiki_rxWikiLinkUrl.s:rx_wikilink_separator.'\%('.
-      \ '\zs'. g:vimwiki_rxWikiLinkDescr. '\ze\)\?'. s:rx_wikilink_suffix
-" }}}
-
-" LINKS: Syntax helper {{{
-let s:rx_wikilink_prefix1 = s:rx_wikilink_prefix . g:vimwiki_rxWikiLinkUrl .
-      \ s:rx_wikilink_separator
-let s:rx_wikilink_suffix1 = s:rx_wikilink_suffix
-" }}}
-
-
-" LINKS: setup of wikiincl regexps {{{
-let g:vimwiki_rxWikiInclPrefix = '{{'
-let g:vimwiki_rxWikiInclSuffix = '}}'
-let g:vimwiki_rxWikiInclSeparator = '|'
-"
-" '{{__LinkUrl__}}'
-let g:vimwiki_WikiInclTemplate1 = g:vimwiki_rxWikiInclPrefix . '__LinkUrl__'. 
-      \ g:vimwiki_rxWikiInclSuffix
-" '{{__LinkUrl____LinkDescription__}}'
-let g:vimwiki_WikiInclTemplate2 = g:vimwiki_rxWikiInclPrefix . '__LinkUrl__'. 
-      \ '__LinkDescription__'.
-      \ g:vimwiki_rxWikiInclSuffix
-
-
-let s:valid_chars = '[^\\\}]'
-let g:vimwiki_rxWikiInclUrl = s:valid_chars.'\{-}'
-let g:vimwiki_rxWikiInclArg = s:valid_chars.'\{-}'
-let g:vimwiki_rxWikiInclArgs = '\%('. g:vimwiki_rxWikiInclSeparator. g:vimwiki_rxWikiInclArg. '\)'.'\{-}'
-"
-"
-" *. {{URL}[{...}]}  - i.e.  {{URL}}, {{URL|ARG1}}, {{URL|ARG1|ARG2}}, etc.
-" *a) match {{URL}[{...}]}
-let g:vimwiki_rxWikiIncl = g:vimwiki_rxWikiInclPrefix.
-      \ g:vimwiki_rxWikiInclUrl. 
-      \ g:vimwiki_rxWikiInclArgs. g:vimwiki_rxWikiInclSuffix
-" *b) match URL within {{URL}[{...}]}
-let g:vimwiki_rxWikiInclMatchUrl = g:vimwiki_rxWikiInclPrefix.
-      \ '\zs'. g:vimwiki_rxWikiInclUrl. '\ze'.
-      \ g:vimwiki_rxWikiInclArgs. g:vimwiki_rxWikiInclSuffix
-" }}}
-
-" LINKS: Syntax helper {{{
-let g:vimwiki_rxWikiInclPrefix1 = g:vimwiki_rxWikiInclPrefix.
-      \ g:vimwiki_rxWikiInclUrl.g:vimwiki_rxWikiInclSeparator
-let g:vimwiki_rxWikiInclSuffix1 = g:vimwiki_rxWikiInclArgs.
-      \ g:vimwiki_rxWikiInclSuffix
-" }}}
-
-" LINKS: Setup weblink regexps {{{
-" 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L)) 
-" let g:vimwiki_rxWeblink = '[\["(|]\@<!'. g:vimwiki_rxWeblinkUrl .
-      " \ '\%([),:;.!?]\=\%([ \t]\|$\)\)\@='
-" Maxim:
-" Simplify free-standing links: URL starts with non(letter|digit)scheme till
-" the whitespace.
-" Stuart, could you check it with markdown templated links? [](http://...), as
-" the last bracket is the part of URL now?
-let g:vimwiki_rxWeblink = '\<'. vimwiki#vars#get_global('rxWeblinkUrl') . '\S*'
-" 0a) match URL within URL
-let g:vimwiki_rxWeblinkMatchUrl = g:vimwiki_rxWeblink
-" 0b) match DESCRIPTION within URL
-let g:vimwiki_rxWeblinkMatchDescr = ''
-" }}}
-
-
-" LINKS: Setup anylink regexps {{{
-let g:vimwiki_rxAnyLink = g:vimwiki_rxWikiLink.'\|'. 
-      \ g:vimwiki_rxWikiIncl.'\|'.g:vimwiki_rxWeblink
-" }}}
-
-
-" }}} end of Links
 
 " LINKS: highlighting is complicated due to "nonexistent" links feature {{{
 function! s:add_target_syntax_ON(target, type) " {{{
@@ -177,34 +53,34 @@ function! s:highlight_existing_links() "{{{
 
   " match [[URL]]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLinkTemplate1),
-        \ safe_links, g:vimwiki_rxWikiLinkDescr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate1')),
+        \ safe_links, vimwiki#vars#get_global('rxWikiLinkDescr'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
   " match [[URL|DESCRIPTION]]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLinkTemplate2),
-        \ safe_links, g:vimwiki_rxWikiLinkDescr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate2')),
+        \ safe_links, vimwiki#vars#get_global('rxWikiLinkDescr'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
 
   " match {{URL}}
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiInclTemplate1),
-        \ safe_links, g:vimwiki_rxWikiInclArgs, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_global('WikiInclTemplate1')),
+        \ safe_links, vimwiki#vars#get_global('rxWikiInclArgs'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
   " match {{URL|...}}
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiInclTemplate2),
-        \ safe_links, g:vimwiki_rxWikiInclArgs, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_global('WikiInclTemplate2')),
+        \ safe_links, vimwiki#vars#get_global('rxWikiInclArgs'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
   " match [[DIRURL]]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLinkTemplate1),
-        \ safe_dirs, g:vimwiki_rxWikiLinkDescr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate1')),
+        \ safe_dirs, vimwiki#vars#get_global('rxWikiLinkDescr'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
   " match [[DIRURL|DESCRIPTION]]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLinkTemplate2),
-        \ safe_dirs, g:vimwiki_rxWikiLinkDescr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate2')),
+        \ safe_dirs, vimwiki#vars#get_global('rxWikiLinkDescr'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
 endfunction "}}}
 
@@ -212,21 +88,21 @@ endfunction "}}}
 " use max highlighting - could be quite slow if there are too many wikifiles
 if vimwiki#vars#get_wikilocal('maxhi')
   " WikiLink
-  call s:add_target_syntax_OFF(g:vimwiki_rxWikiLink)
+  call s:add_target_syntax_OFF(vimwiki#vars#get_global('rxWikiLink'))
   " WikiIncl
-  call s:add_target_syntax_OFF(g:vimwiki_rxWikiIncl)
+  call s:add_target_syntax_OFF(vimwiki#vars#get_global('rxWikiIncl'))
 
   " Subsequently, links verified on vimwiki's path are highlighted as existing
   call s:highlight_existing_links()
 else
   " Wikilink
-  call s:add_target_syntax_ON(g:vimwiki_rxWikiLink, 'VimwikiLink')
+  call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWikiLink'), 'VimwikiLink')
   " WikiIncl
-  call s:add_target_syntax_ON(g:vimwiki_rxWikiIncl, 'VimwikiLink')
+  call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWikiIncl'), 'VimwikiLink')
 endif
 
 " Weblink
-call s:add_target_syntax_ON(g:vimwiki_rxWeblink, 'VimwikiLink')
+call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWeblink'), 'VimwikiLink')
 
 " WikiLink
 " All remaining schemes are highlighted automatically
@@ -237,77 +113,54 @@ let s:rxSchemes = '\%('.
 
 " a) match [[nonwiki-scheme-URL]]
 let s:target = vimwiki#base#apply_template(
-      \ vimwiki#u#escape(g:vimwiki_WikiLinkTemplate1),
-      \ s:rxSchemes.g:vimwiki_rxWikiLinkUrl, g:vimwiki_rxWikiLinkDescr, '')
+      \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate1')),
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiLinkUrl'), vimwiki#vars#get_global('rxWikiLinkDescr'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 " b) match [[nonwiki-scheme-URL|DESCRIPTION]]
 let s:target = vimwiki#base#apply_template(
-      \ vimwiki#u#escape(g:vimwiki_WikiLinkTemplate2),
-      \ s:rxSchemes.g:vimwiki_rxWikiLinkUrl, g:vimwiki_rxWikiLinkDescr, '')
+      \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate2')),
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiLinkUrl'), vimwiki#vars#get_global('rxWikiLinkDescr'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 
 " a) match {{nonwiki-scheme-URL}}
 let s:target = vimwiki#base#apply_template(
-      \ vimwiki#u#escape(g:vimwiki_WikiInclTemplate1),
-      \ s:rxSchemes.g:vimwiki_rxWikiInclUrl, g:vimwiki_rxWikiInclArgs, '')
+      \ vimwiki#u#escape(vimwiki#vars#get_global('WikiInclTemplate1')),
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiInclUrl'), vimwiki#vars#get_global('rxWikiInclArgs'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 " b) match {{nonwiki-scheme-URL}[{...}]}
 let s:target = vimwiki#base#apply_template(
-      \ vimwiki#u#escape(g:vimwiki_WikiInclTemplate2),
-      \ s:rxSchemes.g:vimwiki_rxWikiInclUrl, g:vimwiki_rxWikiInclArgs, '')
+      \ vimwiki#u#escape(vimwiki#vars#get_global('WikiInclTemplate2')),
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiInclUrl'), vimwiki#vars#get_global('rxWikiInclArgs'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 
 " }}}
 
 " generic headers "{{{
-if g:vimwiki_symH
-  "" symmetric
-  for s:i in range(1,6)
-    let g:vimwiki_rxH{s:i}_Template = repeat(g:vimwiki_rxH, s:i).' __Header__ '.repeat(g:vimwiki_rxH, s:i)
-    let g:vimwiki_rxH{s:i} = '^\s*'.g:vimwiki_rxH.'\{'.s:i.'}[^'.g:vimwiki_rxH.'].*[^'.g:vimwiki_rxH.']'.g:vimwiki_rxH.'\{'.s:i.'}\s*$'
-    let g:vimwiki_rxH{s:i}_Start = '^\s*'.g:vimwiki_rxH.'\{'.s:i.'}[^'.g:vimwiki_rxH.'].*[^'.g:vimwiki_rxH.']'.g:vimwiki_rxH.'\{'.s:i.'}\s*$'
-    let g:vimwiki_rxH{s:i}_End = '^\s*'.g:vimwiki_rxH.'\{1,'.s:i.'}[^'.g:vimwiki_rxH.'].*[^'.g:vimwiki_rxH.']'.g:vimwiki_rxH.'\{1,'.s:i.'}\s*$'
-  endfor
-  let g:vimwiki_rxHeader = '^\s*\('.g:vimwiki_rxH.'\{1,6}\)\zs[^'.g:vimwiki_rxH.'].*[^'.g:vimwiki_rxH.']\ze\1\s*$'
-else
-  " asymmetric
-  for s:i in range(1,6)
-    let g:vimwiki_rxH{s:i}_Template = repeat(g:vimwiki_rxH, s:i).' __Header__'
-    let g:vimwiki_rxH{s:i} = '^\s*'.g:vimwiki_rxH.'\{'.s:i.'}[^'.g:vimwiki_rxH.'].*$'
-    let g:vimwiki_rxH{s:i}_Start = '^\s*'.g:vimwiki_rxH.'\{'.s:i.'}[^'.g:vimwiki_rxH.'].*$'
-    let g:vimwiki_rxH{s:i}_End = '^\s*'.g:vimwiki_rxH.'\{1,'.s:i.'}[^'.g:vimwiki_rxH.'].*$'
-  endfor
-  let g:vimwiki_rxHeader = '^\s*\('.g:vimwiki_rxH.'\{1,6}\)\zs[^'.g:vimwiki_rxH.'].*\ze$'
-endif
 
 " Header levels, 1-6
 for s:i in range(1,6)
-  execute 'syntax match VimwikiHeader'.s:i.' /'.g:vimwiki_rxH{s:i}.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
-  execute 'syntax region VimwikiH'.s:i.'Folding start=/'.g:vimwiki_rxH{s:i}_Start.
-        \ '/ end=/'.g:vimwiki_rxH{s:i}_End.'/me=s-1 transparent fold'
+  
+  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.si, s:current_syntax).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
+  execute 'syntax region VimwikiH'.s:i.'Folding start=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_Start', s:current_syntax).
+        \ '/ end=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_End', s:current_syntax).'/me=s-1 transparent fold'
 endfor
 
 
 " }}}
 
-let g:vimwiki_rxPreStart = '^\s*'.g:vimwiki_rxPreStart
-let g:vimwiki_rxPreEnd = '^\s*'.g:vimwiki_rxPreEnd.'\s*$'
-
-let g:vimwiki_rxMathStart = '^\s*'.g:vimwiki_rxMathStart
-let g:vimwiki_rxMathEnd = '^\s*'.g:vimwiki_rxMathEnd.'\s*$'
 
 " possibly concealed chars " {{{
 let s:conceal = exists("+conceallevel") ? ' conceal' : ''
 
-execute 'syn match VimwikiEqInChar contained /'.g:vimwiki_char_eqin.'/'.s:conceal
-execute 'syn match VimwikiBoldChar contained /'.g:vimwiki_char_bold.'/'.s:conceal
-execute 'syn match VimwikiItalicChar contained /'.g:vimwiki_char_italic.'/'.s:conceal
-execute 'syn match VimwikiBoldItalicChar contained /'.g:vimwiki_char_bolditalic.'/'.s:conceal
-execute 'syn match VimwikiItalicBoldChar contained /'.g:vimwiki_char_italicbold.'/'.s:conceal
-execute 'syn match VimwikiCodeChar contained /'.g:vimwiki_char_code.'/'.s:conceal
-execute 'syn match VimwikiDelTextChar contained /'.g:vimwiki_char_deltext.'/'.s:conceal
-execute 'syn match VimwikiSuperScript contained /'.g:vimwiki_char_superscript.'/'.s:conceal
-execute 'syn match VimwikiSubScript contained /'.g:vimwiki_char_subscript.'/'.s:conceal
+execute 'syn match VimwikiEqInChar contained /'.vimwiki#vars#get_syntaxlocal('char_eqin').'/'.s:conceal
+execute 'syn match VimwikiBoldChar contained /'.vimwiki#vars#get_syntaxlocal('char_bold').'/'.s:conceal
+execute 'syn match VimwikiItalicChar contained /'.vimwiki#vars#get_syntaxlocal('char_italic').'/'.s:conceal
+execute 'syn match VimwikiBoldItalicChar contained /'.vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'.s:conceal
+execute 'syn match VimwikiItalicBoldChar contained /'.vimwiki#vars#get_syntaxlocal('char_italicbold').'/'.s:conceal
+execute 'syn match VimwikiCodeChar contained /'.vimwiki#vars#get_syntaxlocal('char_code').'/'.s:conceal
+execute 'syn match VimwikiDelTextChar contained /'.vimwiki#vars#get_syntaxlocal('char_deltext').'/'.s:conceal
+execute 'syn match VimwikiSuperScript contained /'.vimwiki#vars#get_syntaxlocal('char_superscript').'/'.s:conceal
+execute 'syn match VimwikiSubScript contained /'.vimwiki#vars#get_syntaxlocal('char_subscript').'/'.s:conceal
 " }}}
 
 " concealed link parts " {{{
@@ -329,35 +182,34 @@ endif
 " is present) and may be concealed
 
 " conceal wikilinks
-execute 'syn match VimwikiLinkChar /'.s:rx_wikilink_prefix.'/'.s:options
-execute 'syn match VimwikiLinkChar /'.s:rx_wikilink_suffix.'/'.s:options
-execute 'syn match VimwikiLinkChar /'.s:rx_wikilink_prefix1.'/'.s:options
-execute 'syn match VimwikiLinkChar /'.s:rx_wikilink_suffix1.'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rx_wikilink_prefix').'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rx_wikilink_suffix').'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rx_wikilink_prefix1').'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rx_wikilink_suffix1').'/'.s:options
 
 " conceal wikiincls
-execute 'syn match VimwikiLinkChar /'.g:vimwiki_rxWikiInclPrefix.'/'.s:options
-execute 'syn match VimwikiLinkChar /'.g:vimwiki_rxWikiInclSuffix.'/'.s:options
-execute 'syn match VimwikiLinkChar /'.g:vimwiki_rxWikiInclPrefix1.'/'.s:options
-execute 'syn match VimwikiLinkChar /'.g:vimwiki_rxWikiInclSuffix1.'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclPrefix').'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclSuffix').'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclPrefix1').'/'.s:options
+execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclSuffix1').'/'.s:options
 " }}}
 
 " non concealed chars " {{{
-execute 'syn match VimwikiHeaderChar contained /\%(^\s*'.g:vimwiki_rxH.'\+\)\|\%('.g:vimwiki_rxH.'\+\s*$\)/'
-execute 'syn match VimwikiEqInCharT contained /'.g:vimwiki_char_eqin.'/'
-execute 'syn match VimwikiBoldCharT contained /'.g:vimwiki_char_bold.'/'
-execute 'syn match VimwikiItalicCharT contained /'.g:vimwiki_char_italic.'/'
-execute 'syn match VimwikiBoldItalicCharT contained /'.g:vimwiki_char_bolditalic.'/'
-execute 'syn match VimwikiItalicBoldCharT contained /'.g:vimwiki_char_italicbold.'/'
-execute 'syn match VimwikiCodeCharT contained /'.g:vimwiki_char_code.'/'
-execute 'syn match VimwikiDelTextCharT contained /'.g:vimwiki_char_deltext.'/'
-execute 'syn match VimwikiSuperScriptT contained /'.g:vimwiki_char_superscript.'/'
-execute 'syn match VimwikiSubScriptT contained /'.g:vimwiki_char_subscript.'/'
+execute 'syn match VimwikiHeaderChar contained /\%(^\s*'.vimwiki#vars#get_syntaxlocal('rxH').'\+\)\|\%('.vimwiki#vars#get_syntaxlocal('rxH').'\+\s*$\)/'
+execute 'syn match VimwikiEqInCharT contained /'.vimwiki#vars#get_syntaxlocal('char_eqin').'/'
+execute 'syn match VimwikiBoldCharT contained /'.vimwiki#vars#get_syntaxlocal('char_bold').'/'
+execute 'syn match VimwikiItalicCharT contained /'.vimwiki#vars#get_syntaxlocal('char_italic').'/'
+execute 'syn match VimwikiBoldItalicCharT contained /'.vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'
+execute 'syn match VimwikiItalicBoldCharT contained /'.vimwiki#vars#get_syntaxlocal('char_italicbold').'/'
+execute 'syn match VimwikiCodeCharT contained /'.vimwiki#vars#get_syntaxlocal('char_code').'/'
+execute 'syn match VimwikiDelTextCharT contained /'.vimwiki#vars#get_syntaxlocal('char_deltext').'/'
+execute 'syn match VimwikiSuperScriptT contained /'.vimwiki#vars#get_syntaxlocal('char_superscript').'/'
+execute 'syn match VimwikiSubScriptT contained /'.vimwiki#vars#get_syntaxlocal('char_subscript').'/'
 
 " Emoticons
 "syntax match VimwikiEmoticons /\%((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
 
-let g:vimwiki_rxTodo = '\C\%(TODO:\|DONE:\|STARTED:\|FIXME:\|FIXED:\|XXX:\)'
-execute 'syntax match VimwikiTodo /'. g:vimwiki_rxTodo .'/'
+execute 'syntax match VimwikiTodo /'. vimwiki#vars#get_global('rxTodo') .'/'
 " }}}
 
 " main syntax groups {{{
@@ -383,12 +235,12 @@ syntax match VimwikiCellSeparator
       \ /\%(|\)\|\%(-\@<=+\-\@=\)\|\%([|+]\@<=-\+\)/ contained
 
 " Lists
-execute 'syntax match VimwikiList /'.g:vimwiki_rxListItemWithoutCB.'/'
-execute 'syntax match VimwikiList /'.g:vimwiki_rxListDefine.'/'
-execute 'syntax match VimwikiListTodo /'.g:vimwiki_rxListItem.'/'
+execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'/'
+execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListDefine').'/'
+execute 'syntax match VimwikiListTodo /'.vimwiki#vars#get_syntaxlocal('rxListItem').'/'
 
 if vimwiki#vars#get_global('hl_cb_checked') == 1
-  execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemWithoutCB.'\s*\['.g:vimwiki_listsyms_list[4].'\]\s.*$/ '.
+  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'\s*\['.g:vimwiki_listsyms_list[4].'\]\s.*$/ '.
         \ 'contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 elseif vimwiki#vars#get_global('hl_cb_checked') == 2
   execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemAndChildren.'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
index b4e7b55..93ccc92 100644
--- a/syntax/vimwiki_default.vim
+++ b/syntax/vimwiki_default.vim
@@ -3,93 +3,102 @@
 " Desc: Defines default syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
+" s:default_syntax is kind of a reference to the dict in
+" g:vimwiki_syntax_variables['default']. It is used here simply as an
+" abbreviation for the latter.
+let s:default_syntax = g:vimwiki_syntax_variables['default']
+
 " text: $ equation_inline $
-let g:vimwiki_rxEqIn = '\$[^$`]\+\$'
-let g:vimwiki_char_eqin = '\$'
+let s:default_syntax.rxEqIn = '\$[^$`]\+\$'
+let s:default_syntax.char_eqin = '\$'
 
 " text: *strong*
-" let g:vimwiki_rxBold = '\*[^*]\+\*'
-let g:vimwiki_rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
+" let s:default_syntax.rxBold = '\*[^*]\+\*'
+let s:default_syntax.rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'\*'.
       \'\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)'.
       \'\*'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_bold = '*'
+let s:default_syntax.char_bold = '*'
 
 " text: _emphasis_
-" let g:vimwiki_rxItalic = '_[^_]\+_'
-let g:vimwiki_rxItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
+" let s:default_syntax.rxItalic = '_[^_]\+_'
+let s:default_syntax.rxItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'_'.
       \'\%([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`[:space:]]\)'.
       \'_'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_italic = '_'
+let s:default_syntax.char_italic = '_'
 
 " text: *_bold italic_* or _*italic bold*_
-let g:vimwiki_rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
+let s:default_syntax.rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'\*_'.
       \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
       \'_\*'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_bolditalic = '\*_'
+let s:default_syntax.char_bolditalic = '\*_'
 
-let g:vimwiki_rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
+let s:default_syntax.rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'_\*'.
       \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
       \'\*_'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_italicbold = '_\*'
+let s:default_syntax.char_italicbold = '_\*'
 
 " text: `code`
-let g:vimwiki_rxCode = '`[^`]\+`'
-let g:vimwiki_char_code = '`'
+let s:default_syntax.rxCode = '`[^`]\+`'
+let s:default_syntax.char_code = '`'
 
 " text: ~~deleted text~~
-let g:vimwiki_rxDelText = '\~\~[^~`]\+\~\~'
-let g:vimwiki_char_deltext = '\~\~'
+let s:default_syntax.rxDelText = '\~\~[^~`]\+\~\~'
+let s:default_syntax.char_deltext = '\~\~'
 
 " text: ^superscript^
-let g:vimwiki_rxSuperScript = '\^[^^`]\+\^'
-let g:vimwiki_char_superscript = '^'
+let s:default_syntax.rxSuperScript = '\^[^^`]\+\^'
+let s:default_syntax.char_superscript = '^'
 
 " text: ,,subscript,,
-let g:vimwiki_rxSubScript = ',,[^,`]\+,,'
-let g:vimwiki_char_subscript = ',,'
+let s:default_syntax.rxSubScript = ',,[^,`]\+,,'
+let s:default_syntax.char_subscript = ',,'
 
 " generic headers
-let g:vimwiki_rxH = '='
-let g:vimwiki_symH = 1
+let s:default_syntax.rxH = '='
+let s:default_syntax.symH = 1
 
 
 
 " <hr>, horizontal rule
-let g:vimwiki_rxHR = '^-----*$'
+let s:default_syntax.rxHR = '^-----*$'
 
 " Tables. Each line starts and ends with '|'; each cell is separated by '|'
-let g:vimwiki_rxTableSep = '|'
+let s:default_syntax.rxTableSep = '|'
 
 " Lists
-"1 means multiple bullets, like * ** ***
-let g:vimwiki_bullet_types = { '-':0, '*':0, '#':0 }
-let g:vimwiki_number_types = ['1)', '1.', 'i)', 'I)', 'a)', 'A)']
+let s:default_syntax.bullet_types = ['-', '*', '#']
+" 1 means the bullets can be repeatet to indicate the level, like * ** ***
+" 0 means the bullets stand on their own and the level is indicated by the indentation
+let s:default_syntax.recurring_bullets = 0
+let s:default_syntax.number_types = ['1)', '1.', 'i)', 'I)', 'a)', 'A)']
 "this should contain at least one element
 "it is used for i_<C-L><C-J> among other things
-let g:vimwiki_list_markers = ['-', '1.', '*', 'I)', 'a)']
-let g:vimwiki_rxListDefine = '::\(\s\|$\)'
-call vimwiki#lst#setup_marker_infos()
-
-let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
-let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
+let s:default_syntax.list_markers = ['-', '1.', '*', 'I)', 'a)']
+let s:default_syntax.rxListDefine = '::\(\s\|$\)'
 
 " Preformatted text
-let g:vimwiki_rxPreStart = '{{{'
-let g:vimwiki_rxPreEnd = '}}}'
+let s:default_syntax.rxPreStart = '{{{'
+let s:default_syntax.rxPreEnd = '}}}'
 
 " Math block
-let g:vimwiki_rxMathStart = '{{\$'
-let g:vimwiki_rxMathEnd = '}}\$'
+let s:default_syntax.rxMathStart = '{{\$'
+let s:default_syntax.rxMathEnd = '}}\$'
 
-let g:vimwiki_rxComment = '^\s*%%.*$'
-let g:vimwiki_rxTags = '\%(^\|\s\)\@<=:\%([^:''[:space:]]\+:\)\+\%(\s\|$\)\@='
-" see also g:vimwiki_default_tag_search
+let s:default_syntax.rxComment = '^\s*%%.*$'
+let s:default_syntax.rxTags = '\%(^\|\s\)\@<=:\%([^:''[:space:]]\+:\)\+\%(\s\|$\)\@='
+
+let s:default_syntax.header_search = '^\s*\(=\{1,6}\)\([^=].*[^=]\)\1\s*$'
+let s:default_syntax.header_match = '^\s*\(=\{1,6}\)=\@!\s*__Header__\s*\1=\@!\s*$'
+let s:default_syntax.bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
+let s:default_syntax.bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*\%([[:punct:]]\|\s\|$\)\@='
+let s:default_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]'
+let s:default_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)'
+let s:default_syntax.tag_match =  '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)'
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index a07e52d..11c6fee 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -50,7 +50,8 @@ let g:vimwiki_rxHR = '^-----*$'
 let g:vimwiki_rxTableSep = '|'
 
 " Lists
-let g:vimwiki_bullet_types = { '*':1, '#':1 }
+let g:vimwiki_bullet_types = ['*', '#']
+let s:media_syntax.recurring_bullets = 1
 let g:vimwiki_number_types = []
 let g:vimwiki_list_markers = ['*', '#']
 let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'

From b82245b09e69177ba6d96580c98c82689dae08bf Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 31 Dec 2016 20:47:19 +0100
Subject: [PATCH 013/108] Start refactoring the rest -- part 3

Ref #256
---
 autoload/vimwiki/vars.vim   | 61 +++++++++++++++++++++----------------
 syntax/vimwiki_markdown.vim |  7 ++---
 syntax/vimwiki_media.vim    |  4 ---
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index d6438f4..c7891fb 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -310,50 +310,59 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   endif
 
   let g:vimwiki_syntax_variables[a:syntax].rxPreStart = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreStart
-  let g:vimwiki_rxPreEnd = '^\s*'.g:vimwiki_rxPreEnd.'\s*$'
+  let g:vimwiki_syntax_variables[a:syntax].rxPreEnd = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreEnd.'\s*$'
 
-  let g:vimwiki_rxMathStart = '^\s*'.g:vimwiki_rxMathStart
-  let g:vimwiki_rxMathEnd = '^\s*'.g:vimwiki_rxMathEnd.'\s*$'
+  let g:vimwiki_syntax_variables[a:syntax].rxMathStart = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathStart
+  let g:vimwiki_syntax_variables[a:syntax].rxMathEnd = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathEnd.'\s*$'
 
   " list stuff
   let rx_bullet_chars = '['.join(g:vimwiki_syntax_variables[a:syntax].bullet_types, '').']\+'
 
   let g:vimwiki_syntax_variables[a:syntax].multiple_bullet_chars = g:vimwiki_syntax_variables[a:syntax].recurring_bullets ? g:vimwiki_syntax_variables[a:syntax].bullet_types : []
 
-  let s:number_kinds = []
-  let s:number_divisors = ""
-  for i in g:vimwiki_number_types
-    call add(s:number_kinds, i[0])
-    let s:number_divisors .= vimwiki#u#escape(i[1])
+  let g:vimwiki_syntax_variables[a:syntax].number_kinds = []
+  let g:vimwiki_syntax_variables[a:syntax].number_divisors = ''
+  for i in g:vimwiki_syntax_variables[a:syntax].number_types
+    call add(g:vimwiki_syntax_variables[a:syntax].number_kinds, i[0])
+    let g:vimwiki_syntax_variables[a:syntax].number_divisors .= vimwiki#u#escape(i[1])
   endfor
 
-  let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
+  let char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
         \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
 
   "create regexp for bulleted list items
-  let g:vimwiki_rxListBullet = join( map(keys(bullet_types),
-        \'vimwiki#u#escape(v:val).repeat("\\+", bullet_types[v:val])'
+  if !empty(g:vimwiki_syntax_variables[a:syntax].bullet_types)
+    let g:vimwiki_syntax_variables[a:syntax].rxListBullet = join( map(g:vimwiki_syntax_variables[a:syntax].bullet_types,
+        \'vimwiki#u#escape(v:val).repeat("\\+", g:vimwiki_syntax_variables[a:syntax].recurring_bullets)'
         \ ) , '\|')
-
-  "create regex for numbered list items
-  if !empty(g:vimwiki_number_types)
-    let g:vimwiki_rxListNumber = '\C\%('
-    for type in g:vimwiki_number_types[:-2]
-      let g:vimwiki_rxListNumber .= s:char_to_rx[type[0]] .
-            \ vimwiki#u#escape(type[1]) . '\|'
-    endfor
-    let g:vimwiki_rxListNumber .= s:char_to_rx[g:vimwiki_number_types[-1][0]].
-          \ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
   else
     "regex that matches nothing
-    let g:vimwiki_rxListNumber = '$^'
+    let g:vimwiki_syntax_variables[a:syntax].rxListBullet = '$^'
+  endif
+
+  "create regex for numbered list items
+  if !empty(g:vimwiki_syntax_variables[a:syntax].number_types)
+    let g:vimwiki_syntax_variables[a:syntax].rxListNumber = '\C\%('
+    for type in g:vimwiki_syntax_variables[a:syntax].number_types[:-2]
+      let g:vimwiki_syntax_variables[a:syntax].rxListNumber .= char_to_rx[type[0]] .
+            \ vimwiki#u#escape(type[1]) . '\|'
+    endfor
+    let g:vimwiki_syntax_variables[a:syntax].rxListNumber .= char_to_rx[g:vimwiki_syntax_variables[a:syntax].number_types[-1][0]].
+          \ vimwiki#u#escape(g:vimwiki_syntax_variables[a:syntax].number_types[-1][1]) . '\)'
+  else
+    "regex that matches nothing
+    let g:vimwiki_syntax_variables[a:syntax].rxListNumber = '$^'
   endif
 
   "the user can set the listsyms as string, but vimwiki needs a list
-  let g:vimwiki_listsyms_list = split(vimwiki#vars#get_global('listsyms'), '\zs')
-  let s:default_syntax.rxListItemWithoutCB = '^\s*\%(\('.s:default_syntax.rxListBullet.'\)\|\('.s:default_syntax.rxListNumber.'\)\)\s'
-  let s:default_syntax.rxListItem = s:default_syntax.rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
-  let s:default_syntax.rxListItemAndChildren = '^\(\s*\)\%('.s:default_syntax.rxListBullet.'\|'.s:default_syntax.rxListNumber.'\)\s\+\['.s:default_syntax.listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
+  let g:vimwiki_syntax_variables[a:syntax].listsyms_list = split(vimwiki#vars#get_global('listsyms'), '\zs')
+  let g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\|\('.g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\)\s'
+  let g:vimwiki_syntax_variables[a:syntax].rxListItem = g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
+  if g:vimwiki_syntax_variables[a:syntax].recurring_bullets
+    let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\['.g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\).*\|^$\|\s.*\)\)*'
+  else
+    let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'.g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['.g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
+  endif
 endfunction
 
 
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 7937db6..54e241e 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -69,16 +69,13 @@ let g:vimwiki_rxHR = '^-----*$'
 let g:vimwiki_rxTableSep = '|'
 
 " Lists
-let g:vimwiki_bullet_types = { '-':0, '*':0, '+':0 }
+let g:vimwiki_bullet_types = ['-', '*', '+']
+let s:media_syntax.recurring_bullets = 0
 let g:vimwiki_number_types = ['1.']
 let g:vimwiki_list_markers = ['-', '*', '+', '1.']
 let g:vimwiki_rxListDefine = '::\%(\s\|$\)'
 call vimwiki#lst#setup_marker_infos()
 
-let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
-let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
-
 " Preformatted text
 let g:vimwiki_rxPreStart = '```'
 let g:vimwiki_rxPreEnd = '```'
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index 11c6fee..9b3ff12 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -57,10 +57,6 @@ let g:vimwiki_list_markers = ['*', '#']
 let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'
 call vimwiki#lst#setup_marker_infos()
 
-let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
-let g:vimwiki_rxListItemAndChildren = '^\('.g:vimwiki_rxListBullet.'\)\s\+\['.g:vimwiki_listsyms_list[4].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_rxListBullet.'\).*\|^$\|\s.*\)\)*'
-
 " Preformatted text
 let g:vimwiki_rxPreStart = '<pre>'
 let g:vimwiki_rxPreEnd = '<\/pre>'

From 203fb5b430d54d226240085a88f4047c7dcf44d1 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 4 Jan 2017 21:53:03 +0100
Subject: [PATCH 014/108] Start refactoring the rest -- part 4

Ref #256
---
 autoload/vimwiki/vars.vim | 27 ++++++++------
 ftplugin/vimwiki.vim      |  4 +--
 plugin/vimwiki.vim        |  2 +-
 syntax/vimwiki.vim        | 76 ++++++++++++++++++---------------------
 4 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index c7891fb..b13c147 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -131,9 +131,9 @@ function! s:populate_global_variables()
         \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator.'\%('.
         \ '\zs'. g:vimwiki_global_vars.rxWikiLinkDescr. '\ze\)\?'. g:vimwiki_global_vars.rx_wikilink_suffix
 
-  let rx_wikilink_prefix1 = g:vimwiki_global_vars.rx_wikilink_prefix . g:vimwiki_global_vars.rxWikiLinkUrl .
+  let g:vimwiki_global_vars.rx_wikilink_prefix1 = g:vimwiki_global_vars.rx_wikilink_prefix . g:vimwiki_global_vars.rxWikiLinkUrl .
         \ g:vimwiki_global_vars.rx_wikilink_separator
-  let rx_wikilink_suffix1 = g:vimwiki_global_vars.rx_wikilink_suffix
+  let g:vimwiki_global_vars.rx_wikilink_suffix1 = g:vimwiki_global_vars.rx_wikilink_suffix
 
   let g:vimwiki_global_vars.rxWikiInclPrefix = '{{'
   let g:vimwiki_global_vars.rxWikiInclSuffix = '}}'
@@ -180,6 +180,13 @@ function! s:populate_global_variables()
       \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_global_vars.rxWeblink
 
   let g:vimwiki_global_vars.rxTodo = '\C\%(TODO:\|DONE:\|STARTED:\|FIXME:\|FIXED:\|XXX:\)'
+
+  " default colors when headers of different levels are highlighted differently
+  " not making it yet another option; needed by ColorScheme autocommand
+  let g:vimwiki_global_vars.hcolor_guifg_light = ['#aa5858', '#507030', '#1030a0', '#103040', '#505050', '#636363']
+  let g:vimwiki_global_vars.hcolor_ctermfg_light = ['DarkRed', 'DarkGreen', 'DarkBlue', 'Black', 'Black', 'Black']
+  let g:vimwiki_global_vars.hcolor_guifg_dark = ['#e08090', '#80e090', '#6090e0', '#c0c0f0', '#e0e0f0', '#f0f0f0']
+  let g:vimwiki_global_vars.hcolor_ctermfg_dark = ['Red', 'Green', 'Blue', 'White', 'White', 'White']
 endfunction
 
 
@@ -292,19 +299,19 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   if g:vimwiki_syntax_variables[a:syntax].symH
     " symmetric headers
     for i in range(1,6)
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Template = repeat(header_symbol, i).' __Header__ '.repeat(header_symbol, i)
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i} = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Start = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_End = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{1,'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Template'] = repeat(header_symbol, i).' __Header__ '.repeat(header_symbol, i)
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Start'] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_End'] = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{1,'.i.'}\s*$'
     endfor
     let g:vimwiki_syntax_variables[a:syntax].rxHeader = '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*[^'.header_symbol.']\ze\1\s*$'
   else
     " asymmetric
     for i in range(1,6)
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Template = repeat(header_symbol, i).' __Header__'
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i} = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_Start = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
-      let g:vimwiki_syntax_variables[a:syntax].rxH{i}_End = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Template'] = repeat(header_symbol, i).' __Header__'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Start'] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_End'] = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*$'
     endfor
     let g:vimwiki_syntax_variables[a:syntax].rxHeader = '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*\ze$'
   endif
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 67e65a6..ec6003b 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -530,7 +530,7 @@ endif
 noremap <silent><script><buffer>
     \ <Plug>VimwikiRemoveCBInList :VimwikiRemoveCBInList<CR>
 
-for s:char in keys(vimwiki#vars#get_syntaxlocal('bullet_types'))
+for s:char in vimwiki#vars#get_syntaxlocal('bullet_types')
   if !hasmapto(':VimwikiChangeSymbolTo '.s:char.'<CR>')
     exe 'noremap <silent><buffer> gl'.s:char.' :VimwikiChangeSymbolTo '.s:char.'<CR>'
   endif
@@ -539,7 +539,7 @@ for s:char in keys(vimwiki#vars#get_syntaxlocal('bullet_types'))
   endif
 endfor
 
-for s:typ in g:vimwiki_number_types
+for s:typ in vimwiki#vars#get_syntaxlocal('number_types')
   if !hasmapto(':VimwikiChangeSymbolTo '.s:typ.'<CR>')
     exe 'noremap <silent><buffer> gl'.s:typ[0].' :VimwikiChangeSymbolTo '.s:typ.'<CR>'
   endif
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 900221d..a703d48 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -141,7 +141,7 @@ function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
   hi def VimwikiUnderline gui=underline
   if vimwiki#vars#get_global('hl_headers') == 1
     for i in range(1,6)
-      execute 'hi def VimwikiHeader'.i.' guibg=bg guifg='.g:vimwiki_hcolor_guifg_{&bg}[i-1].' gui=bold ctermfg='.g:vimwiki_hcolor_ctermfg_{&bg}[i-1].' term=bold cterm=bold' 
+      execute 'hi def VimwikiHeader'.i.' guibg=bg guifg='.vimwiki#vars#get_global('hcolor_guifg_'.&bg)[i-1].' gui=bold ctermfg='.vimwiki#vars#get_global('hcolor_ctermfg_'.&bg)[i-1].' term=bold cterm=bold' 
     endfor
   endif
 endfunction "}}}
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 074a666..74a00a6 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -12,9 +12,9 @@ endif
 
 if vimwiki#vars#get_wikilocal('maxhi')
   let b:existing_wikifiles =
-        \ vimwiki#base#get_wikilinks(g:vimwiki_current_idx, 1)
+        \ vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 1)
   let b:existing_wikidirs  =
-        \ vimwiki#base#get_wiki_directories(g:vimwiki_current_idx)
+        \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr'))
 endif
 
 let s:current_syntax = vimwiki#vars#get_wikilocal('syntax')
@@ -140,7 +140,7 @@ call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 " Header levels, 1-6
 for s:i in range(1,6)
   
-  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.si, s:current_syntax).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
+  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i, s:current_syntax).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
   execute 'syntax region VimwikiH'.s:i.'Folding start=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_Start', s:current_syntax).
         \ '/ end=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_End', s:current_syntax).'/me=s-1 transparent fold'
 endfor
@@ -240,48 +240,48 @@ execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListDefine'
 execute 'syntax match VimwikiListTodo /'.vimwiki#vars#get_syntaxlocal('rxListItem').'/'
 
 if vimwiki#vars#get_global('hl_cb_checked') == 1
-  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'\s*\['.g:vimwiki_listsyms_list[4].'\]\s.*$/ '.
+  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[4].'\]\s.*$/ '.
         \ 'contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 elseif vimwiki#vars#get_global('hl_cb_checked') == 2
-  execute 'syntax match VimwikiCheckBoxDone /'.g:vimwiki_rxListItemAndChildren.'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemAndChildren').'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 endif
 
 
-execute 'syntax match VimwikiEqIn /'.g:vimwiki_rxEqIn.'/ contains=VimwikiEqInChar'
-execute 'syntax match VimwikiEqInT /'.g:vimwiki_rxEqIn.'/ contained contains=VimwikiEqInCharT'
+execute 'syntax match VimwikiEqIn /'.vimwiki#vars#get_syntaxlocal('rxEqIn').'/ contains=VimwikiEqInChar'
+execute 'syntax match VimwikiEqInT /'.vimwiki#vars#get_syntaxlocal('rxEqIn').'/ contained contains=VimwikiEqInCharT'
 
-execute 'syntax match VimwikiBold /'.g:vimwiki_rxBold.'/ contains=VimwikiBoldChar,@Spell'
-execute 'syntax match VimwikiBoldT /'.g:vimwiki_rxBold.'/ contained contains=VimwikiBoldCharT,@Spell'
+execute 'syntax match VimwikiBold /'.vimwiki#vars#get_syntaxlocal('rxBold').'/ contains=VimwikiBoldChar,@Spell'
+execute 'syntax match VimwikiBoldT /'.vimwiki#vars#get_syntaxlocal('rxBold').'/ contained contains=VimwikiBoldCharT,@Spell'
 
-execute 'syntax match VimwikiItalic /'.g:vimwiki_rxItalic.'/ contains=VimwikiItalicChar,@Spell'
-execute 'syntax match VimwikiItalicT /'.g:vimwiki_rxItalic.'/ contained contains=VimwikiItalicCharT,@Spell'
+execute 'syntax match VimwikiItalic /'.vimwiki#vars#get_syntaxlocal('rxItalic').'/ contains=VimwikiItalicChar,@Spell'
+execute 'syntax match VimwikiItalicT /'.vimwiki#vars#get_syntaxlocal('rxItalic').'/ contained contains=VimwikiItalicCharT,@Spell'
 
-execute 'syntax match VimwikiBoldItalic /'.g:vimwiki_rxBoldItalic.'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
-execute 'syntax match VimwikiBoldItalicT /'.g:vimwiki_rxBoldItalic.'/ contained contains=VimwikiBoldItalicChatT,VimwikiItalicBoldCharT,@Spell'
+execute 'syntax match VimwikiBoldItalic /'.vimwiki#vars#get_syntaxlocal('rxBoldItalic').'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
+execute 'syntax match VimwikiBoldItalicT /'.vimwiki#vars#get_syntaxlocal('rxBoldItalic').'/ contained contains=VimwikiBoldItalicChatT,VimwikiItalicBoldCharT,@Spell'
 
-execute 'syntax match VimwikiItalicBold /'.g:vimwiki_rxItalicBold.'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
-execute 'syntax match VimwikiItalicBoldT /'.g:vimwiki_rxItalicBold.'/ contained contains=VimwikiBoldItalicCharT,VimsikiItalicBoldCharT,@Spell'
+execute 'syntax match VimwikiItalicBold /'.vimwiki#vars#get_syntaxlocal('rxItalicBold').'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
+execute 'syntax match VimwikiItalicBoldT /'.vimwiki#vars#get_syntaxlocal('rxItalicBold').'/ contained contains=VimwikiBoldItalicCharT,VimsikiItalicBoldCharT,@Spell'
 
-execute 'syntax match VimwikiDelText /'.g:vimwiki_rxDelText.'/ contains=VimwikiDelTextChar,@Spell'
-execute 'syntax match VimwikiDelTextT /'.g:vimwiki_rxDelText.'/ contained contains=VimwikiDelTextChar,@Spell'
+execute 'syntax match VimwikiDelText /'.vimwiki#vars#get_syntaxlocal('rxDelText').'/ contains=VimwikiDelTextChar,@Spell'
+execute 'syntax match VimwikiDelTextT /'.vimwiki#vars#get_syntaxlocal('rxDelText').'/ contained contains=VimwikiDelTextChar,@Spell'
 
-execute 'syntax match VimwikiSuperScript /'.g:vimwiki_rxSuperScript.'/ contains=VimwikiSuperScriptChar,@Spell'
-execute 'syntax match VimwikiSuperScriptT /'.g:vimwiki_rxSuperScript.'/ contained contains=VimwikiSuperScriptCharT,@Spell'
+execute 'syntax match VimwikiSuperScript /'.vimwiki#vars#get_syntaxlocal('rxSuperScript').'/ contains=VimwikiSuperScriptChar,@Spell'
+execute 'syntax match VimwikiSuperScriptT /'.vimwiki#vars#get_syntaxlocal('rxSuperScript').'/ contained contains=VimwikiSuperScriptCharT,@Spell'
 
-execute 'syntax match VimwikiSubScript /'.g:vimwiki_rxSubScript.'/ contains=VimwikiSubScriptChar,@Spell'
-execute 'syntax match VimwikiSubScriptT /'.g:vimwiki_rxSubScript.'/ contained contains=VimwikiSubScriptCharT,@Spell'
+execute 'syntax match VimwikiSubScript /'.vimwiki#vars#get_syntaxlocal('rxSubScript').'/ contains=VimwikiSubScriptChar,@Spell'
+execute 'syntax match VimwikiSubScriptT /'.vimwiki#vars#get_syntaxlocal('rxSubScript').'/ contained contains=VimwikiSubScriptCharT,@Spell'
 
-execute 'syntax match VimwikiCode /'.g:vimwiki_rxCode.'/ contains=VimwikiCodeChar'
-execute 'syntax match VimwikiCodeT /'.g:vimwiki_rxCode.'/ contained contains=VimwikiCodeCharT'
+execute 'syntax match VimwikiCode /'.vimwiki#vars#get_syntaxlocal('rxCode').'/ contains=VimwikiCodeChar'
+execute 'syntax match VimwikiCodeT /'.vimwiki#vars#get_syntaxlocal('rxCode').'/ contained contains=VimwikiCodeCharT'
 
 " <hr> horizontal rule
-execute 'syntax match VimwikiHR /'.g:vimwiki_rxHR.'/'
+execute 'syntax match VimwikiHR /'.vimwiki#vars#get_syntaxlocal('rxHR').'/'
 
-execute 'syntax region VimwikiPre start=/'.g:vimwiki_rxPreStart.
-      \ '/ end=/'.g:vimwiki_rxPreEnd.'/ contains=@Spell'
+execute 'syntax region VimwikiPre start=/'.vimwiki#vars#get_syntaxlocal('rxPreStart').
+      \ '/ end=/'.vimwiki#vars#get_syntaxlocal('rxPreEnd').'/ contains=@Spell'
 
-execute 'syntax region VimwikiMath start=/'.g:vimwiki_rxMathStart.
-      \ '/ end=/'.g:vimwiki_rxMathEnd.'/ contains=@Spell'
+execute 'syntax region VimwikiMath start=/'.vimwiki#vars#get_syntaxlocal('rxMathStart').
+      \ '/ end=/'.vimwiki#vars#get_syntaxlocal('rxMathEnd').'/ contains=@Spell'
 
 
 " placeholders
@@ -298,11 +298,11 @@ if vimwiki#vars#get_global('valid_html_tags') != ''
   execute 'syntax match VimwikiItalic #\c<i>.\{-}</i># contains=VimwikiHTMLTag'
   execute 'syntax match VimwikiUnderline #\c<u>.\{-}</u># contains=VimwikiHTMLTag'
 
-  execute 'syntax match VimwikiComment /'.g:vimwiki_rxComment.'/ contains=@Spell'
+  execute 'syntax match VimwikiComment /'.vimwiki#vars#get_syntaxlocal('rxComment').'/ contains=@Spell'
 endif
 
 " tags
-execute 'syntax match VimwikiTag /'.g:vimwiki_rxTags.'/'
+execute 'syntax match VimwikiTag /'.vimwiki#vars#get_syntaxlocal('rxTags').'/'
 
 " }}}
 
@@ -317,14 +317,8 @@ if vimwiki#vars#get_global('hl_headers') == 0
     execute 'hi def link VimwikiHeader'.s:i.' Title'
   endfor
 else
-  " default colors when headers of different levels are highlighted differently 
-  " not making it yet another option; needed by ColorScheme autocommand
-  let g:vimwiki_hcolor_guifg_light = ['#aa5858','#507030','#1030a0','#103040','#505050','#636363']
-  let g:vimwiki_hcolor_ctermfg_light = ['DarkRed','DarkGreen','DarkBlue','Black','Black','Black']
-  let g:vimwiki_hcolor_guifg_dark = ['#e08090','#80e090','#6090e0','#c0c0f0','#e0e0f0','#f0f0f0']
-  let g:vimwiki_hcolor_ctermfg_dark = ['Red','Green','Blue','White','White','White']
   for s:i in range(1,6)
-    execute 'hi def VimwikiHeader'.s:i.' guibg=bg guifg='.g:vimwiki_hcolor_guifg_{&bg}[s:i-1].' gui=bold ctermfg='.g:vimwiki_hcolor_ctermfg_{&bg}[s:i-1].' term=bold cterm=bold'
+    execute 'hi def VimwikiHeader'.s:i.' guibg=bg guifg='.vimwiki#vars#get_global('hcolor_guifg_'.&bg)[s:i-1].' gui=bold ctermfg='.vimwiki#vars#get_global('ctermfg_'.&bg)[s:i-1].' term=bold cterm=bold'
   endfor
 endif
 "}}}
@@ -427,16 +421,16 @@ endif
 if !empty(s:nested)
   for [s:hl_syntax, s:vim_syntax] in items(s:nested)
     call vimwiki#base#nested_syntax(s:vim_syntax,
-          \ g:vimwiki_rxPreStart.'\%(.*[[:blank:][:punct:]]\)\?'.
+          \ vimwiki#vars#get_syntaxlocal('rxPreStart').'\%(.*[[:blank:][:punct:]]\)\?'.
           \ s:hl_syntax.'\%([[:blank:][:punct:]].*\)\?',
-          \ g:vimwiki_rxPreEnd, 'VimwikiPre')
+          \ vimwiki#vars#get_syntaxlocal('rxPreEnd'), 'VimwikiPre')
   endfor
 endif
 " LaTeX
 call vimwiki#base#nested_syntax('tex', 
-      \ g:vimwiki_rxMathStart.'\%(.*[[:blank:][:punct:]]\)\?'.
+      \ vimwiki#vars#get_syntaxlocal('rxMathStart').'\%(.*[[:blank:][:punct:]]\)\?'.
       \ '\%([[:blank:][:punct:]].*\)\?',
-      \ g:vimwiki_rxMathEnd, 'VimwikiMath')
+      \ vimwiki#vars#get_syntaxlocal('rxMathEnd'), 'VimwikiMath')
 "}}}
 
 

From 4a96eb4d32c14f13ed6ea500c5b3f1a2fdea4a15 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 4 Jan 2017 22:10:10 +0100
Subject: [PATCH 015/108] Remove two undocumented and probably buggy features

---
 autoload/vimwiki/base.vim | 110 --------------------------------------
 ftplugin/vimwiki.vim      |   5 --
 2 files changed, 115 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 21a6480..6d4ead6 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -24,98 +24,6 @@ function! s:vimwiki_get_known_syntaxes() " {{{
   return keys(syntaxes)
 endfunction " }}}
 
-" vimwiki#base#apply_wiki_options
-function! vimwiki#base#apply_wiki_options(options) " {{{ Update the current
-  " wiki using the options dictionary
-  for kk in keys(a:options)
-    let g:vimwiki_list[g:vimwiki_current_idx][kk] = a:options[kk]
-  endfor
-  call Validate_wiki_options(g:vimwiki_current_idx)
-  call vimwiki#base#setup_buffer_state(g:vimwiki_current_idx)
-endfunction " }}}
-
-" vimwiki#base#read_wiki_options
-function! vimwiki#base#read_wiki_options(check) " {{{ Attempt to read wiki
-  " options from the current page's directory, or its ancesters.  If a file
-  "   named vimwiki.vimrc is found, which declares a wiki-options dictionary
-  "   named g:local_wiki, a message alerts the user that an update has been
-  "   found and may be applied.  If the argument check=1, the user is queried
-  "   before applying the update to the current wiki's option.
-
-  " Save global vimwiki options ... after all, the global list is often
-  "   initialized for the first time in vimrc files, and we don't want to
-  "   overwrite !!  (not to mention all the other globals ...)
-  let l:vimwiki_list = deepcopy(g:vimwiki_list, 1)
-  "
-  if a:check > 1
-    call vimwiki#base#print_wiki_state()
-    echo " \n"
-  endif
-  "
-  let g:local_wiki = {}
-  let done = 0
-  " ... start the wild-goose chase!
-  for invsubdir in ['.', '..', '../..', '../../..']
-    " other names are possible, but most vimrc files will cause grief!
-    for nm in ['vimwiki.vimrc']
-      " TODO: use an alternate strategy, instead of source, to read options
-      if done
-        continue
-      endif
-      "
-      let local_wiki_options_filename = expand('%:p:h').'/'.invsubdir.'/'.nm
-      if !filereadable(local_wiki_options_filename)
-        continue
-      endif
-      "
-      echo "\nFound file : ".local_wiki_options_filename
-      let query = "Vimwiki: Check for options in this file [Y]es/[n]o? "
-      if a:check > 0 && input(query) =~? '^n')
-        continue
-      endif
-      "
-      try
-        execute 'source '.local_wiki_options_filename
-      catch
-      endtry
-      if empty(g:local_wiki)
-        continue
-      endif
-      "
-      if a:check > 0
-        echo "\n\nFound wiki options\n  g:local_wiki = ".string(g:local_wiki)
-        let query = "Vimwiki: Apply these options [Y]es/[n]o? "
-        if input(query) =~? '^n'
-          let g:local_wiki = {}
-          continue
-        endif
-      endif
-      "
-      " restore global list
-      " - this prevents corruption by g:vimwiki_list in options_file
-      let g:vimwiki_list = deepcopy(l:vimwiki_list, 1)
-      "
-      call vimwiki#base#apply_wiki_options(g:local_wiki)
-      let done = 1
-    endfor
-  endfor
-  if !done
-    "
-    " restore global list, if no local options were found
-    " - this prevents corruption by g:vimwiki_list in options_file
-    let g:vimwiki_list = deepcopy(l:vimwiki_list, 1)
-    "
-  endif
-  if a:check > 1
-    echo " \n "
-    if done
-      call vimwiki#base#print_wiki_state()
-    else
-      echo "Vimwiki: No options were applied."
-    endif
-  endif
-endfunction " }}}
-
 " vimwiki#base#setup_buffer_state
 function! vimwiki#base#setup_buffer_state(idx) " {{{ Init page-specific variables
   " Only call this function *after* opening a wiki page.
@@ -153,24 +61,6 @@ function! vimwiki#base#recall_buffer_state() "{{{
   endif
 endfunction " }}}
 
-" vimwiki#base#print_wiki_state
-function! vimwiki#base#print_wiki_state() "{{{ print wiki options
-  "   and buffer state variables
-  let g_width = 18
-  let b_width = 18
-  echo "- Wiki Options (idx=".g:vimwiki_current_idx.") -"
-  for kk in VimwikiGetOptionNames()
-      echo "  '".kk."': ".repeat(' ', g_width-len(kk)).string(VimwikiGet(kk))
-  endfor
-  if !exists('b:vimwiki_list')
-    return
-  endif
-  echo "- Cached Variables -"
-  for kk in keys(b:vimwiki_list)
-    echo "  '".kk."': ".repeat(' ', b_width-len(kk)).string(b:vimwiki_list[kk])
-  endfor
-endfunction "}}}
-
 " vimwiki#base#file_pattern
 function! vimwiki#base#file_pattern(files) "{{{ Get search regex from glob()
   " string. Aim to support *all* special characters, forcing the user to choose
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index ec6003b..b9f74e3 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -666,8 +666,3 @@ endif
 command! -buffer VimwikiPasteUrl call vimwiki#html#PasteUrl(expand('%:p'))
 command! -buffer VimwikiCatUrl call vimwiki#html#CatUrl(expand('%:p'))
 " }}}
-
-" DEBUGGING {{{
-command! VimwikiPrintWikiState call vimwiki#base#print_wiki_state()
-command! VimwikiReadLocalOptions call vimwiki#base#read_wiki_options(1)
-" }}}

From 1806d3edfacd293b6e7c99ba97dbea163161a62f Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 7 Jan 2017 21:51:15 +0100
Subject: [PATCH 016/108] Start refactoring the rest -- part 5

Ref #256
---
 autoload/vimwiki/base.vim          | 43 ++--------------
 autoload/vimwiki/diary.vim         | 23 ++++-----
 autoload/vimwiki/html.vim          | 80 ++++++++++++++--------------
 autoload/vimwiki/lst.vim           | 56 ++++++++++----------
 autoload/vimwiki/markdown_base.vim | 56 ++++++++++----------
 autoload/vimwiki/tags.vim          | 19 ++++---
 autoload/vimwiki/tbl.vim           |  2 +-
 autoload/vimwiki/vars.vim          |  9 +++-
 ftplugin/vimwiki.vim               | 10 ++--
 syntax/omnipresent_syntax.vim      | 35 -------------
 syntax/vimwiki_markdown.vim        | 83 +++++++++++++++++-------------
 syntax/vimwiki_media.vim           | 79 ++++++++++++++++------------
 12 files changed, 227 insertions(+), 268 deletions(-)
 delete mode 100644 syntax/omnipresent_syntax.vim

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 6d4ead6..14592cf 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -24,43 +24,6 @@ function! s:vimwiki_get_known_syntaxes() " {{{
   return keys(syntaxes)
 endfunction " }}}
 
-" vimwiki#base#setup_buffer_state
-function! vimwiki#base#setup_buffer_state(idx) " {{{ Init page-specific variables
-  " Only call this function *after* opening a wiki page.
-  if a:idx < 0
-    return
-  endif
-
-  let g:vimwiki_current_idx = a:idx
-
-  " The following state depends on the current active wiki page
-  let subdir = vimwiki#base#current_subdir(a:idx)
-  call VimwikiSet('subdir', subdir, a:idx)
-  call VimwikiSet('invsubdir', vimwiki#base#invsubdir(subdir), a:idx)
-
-  if vimwiki#vars#get_global('auto_chdir') == 1
-    exe 'lcd' vimwiki#vars#get_wikilocal('path')
-  endif
-
-  " update cache
-  call vimwiki#base#cache_buffer_state()
-endfunction " }}}
-
-" vimwiki#base#cache_buffer_state
-function! vimwiki#base#cache_buffer_state() "{{{
-  let b:vimwiki_idx = g:vimwiki_current_idx
-endfunction "}}}
-
-" vimwiki#base#recall_buffer_state
-function! vimwiki#base#recall_buffer_state() "{{{
-  if !exists('b:vimwiki_idx')
-    return 0
-  else
-    let g:vimwiki_current_idx = b:vimwiki_idx
-    return 1
-  endif
-endfunction " }}}
-
 " vimwiki#base#file_pattern
 function! vimwiki#base#file_pattern(files) "{{{ Get search regex from glob()
   " string. Aim to support *all* special characters, forcing the user to choose
@@ -97,8 +60,8 @@ function! vimwiki#base#subdir(path, filename) "{{{
 endfunction "}}}
 
 " vimwiki#base#current_subdir
-function! vimwiki#base#current_subdir(idx)"{{{
-  return vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path', a:idx), expand('%:p'))
+function! vimwiki#base#current_subdir()"{{{
+  return vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path'), expand('%:p'))
 endfunction"}}}
 
 " vimwiki#base#invsubdir
@@ -1229,7 +1192,7 @@ endfunction "}}}
 " vimwiki#base#rename_link
 " Rename current file, update all links to it
 function! vimwiki#base#rename_link() "{{{
-  let subdir = VimwikiGet('subdir')
+  let subdir = vimwiki#vars#get_bufferlocal('subdir')
   let old_fname = subdir.expand('%:t')
 
   " there is no file (new one maybe)
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 682668f..3f662ed 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -21,12 +21,12 @@ function! s:prefix_zero(num) "{{{
 endfunction "}}}
 
 function! s:diary_path(...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
+  let idx = a:0 == 0 ? vimwiki#vars#get_bufferlocal('wiki_nr') : a:1
   return vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx)
 endfunction "}}}
 
 function! s:diary_index(...) "{{{
-  let idx = a:0 == 0 ? g:vimwiki_current_idx : a:1
+  let idx = a:0 == 0 ? vimwiki#vars#get_bufferlocal('wiki_nr') : a:1
   return s:diary_path(idx).vimwiki#vars#get_wikilocal('diary_index', idx).vimwiki#vars#get_wikilocal('ext', idx)
 endfunction "}}}
 
@@ -62,14 +62,15 @@ endfun "}}}
 " Diary index stuff {{{
 fun! s:read_captions(files) "{{{
   let result = {}
+  let rx_header = vimwiki#vars#get_syntaxlocal('rxHeader')
   for fl in a:files
     " remove paths and extensions
     let fl_key = fnamemodify(fl, ':t:r')
 
     if filereadable(fl)
       for line in readfile(fl, '', s:vimwiki_max_scan_for_caption)
-        if line =~# g:vimwiki_rxHeader && !has_key(result, fl_key)
-          let result[fl_key] = vimwiki#u#trim(matchstr(line, g:vimwiki_rxHeader))
+        if line =~# rx_header && !has_key(result, fl_key)
+          let result[fl_key] = vimwiki#u#trim(matchstr(line, rx_header))
         endif
       endfor
     endif
@@ -132,19 +133,19 @@ function! s:format_diary() "{{{
 
   for year in s:sort(keys(g_files))
     call add(result, '')
-    call add(result, substitute(g:vimwiki_rxH2_Template, '__Header__', year , ''))
+    call add(result, substitute(vimwiki#vars#get_syntaxlocal('rxH2_Template'), '__Header__', year , ''))
 
     for month in s:sort(keys(g_files[year]))
       call add(result, '')
-      call add(result, substitute(g:vimwiki_rxH3_Template, '__Header__', s:get_month_name(month), ''))
+      call add(result, substitute(vimwiki#vars#get_syntaxlocal('rxH3_Template'), '__Header__', s:get_month_name(month), ''))
 
       for [fl, cap] in s:sort(items(g_files[year][month]))
         if empty(cap)
-          let entry = substitute(g:vimwiki_WikiLinkTemplate1, '__LinkUrl__', fl, '')
+          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', fl, '')
           let entry = substitute(entry, '__LinkDescription__', cap, '')
           call add(result, repeat(' ', &sw).'* '.entry)
         else
-          let entry = substitute(g:vimwiki_WikiLinkTemplate2, '__LinkUrl__', fl, '')
+          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__', fl, '')
           let entry = substitute(entry, '__LinkDescription__', cap, '')
           call add(result, repeat(' ', &sw).'* '.entry)
         endif
@@ -185,7 +186,6 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
   endif
 
   call vimwiki#base#open_link(cmd, link, s:diary_index(idx))
-  call vimwiki#base#setup_buffer_state(idx)
 endfunction "}}}
 
 function! vimwiki#diary#goto_diary_index(wnum) "{{{
@@ -202,7 +202,6 @@ function! vimwiki#diary#goto_diary_index(wnum) "{{{
   endif
 
   call vimwiki#base#edit_file('e', s:diary_index(idx), '')
-  call vimwiki#base#setup_buffer_state(idx)
 endfunction "}}}
 
 function! vimwiki#diary#goto_next_day() "{{{
@@ -249,7 +248,7 @@ function! vimwiki#diary#generate_diary_section() "{{{
   let current_file = vimwiki#path#path_norm(expand("%:p"))
   let diary_file = vimwiki#path#path_norm(s:diary_index())
   if vimwiki#path#is_equal(current_file, diary_file)
-    let content_rx = '^\%(\s*\* \)\|\%(^\s*$\)\|\%('.g:vimwiki_rxHeader.'\)'
+    let content_rx = '^\%(\s*\* \)\|\%(^\s*$\)\|\%('.vimwiki#vars#get_syntaxlocal('rxHeader').'\)'
     call vimwiki#base#update_listing_in_buffer(s:format_diary(),
           \ vimwiki#vars#get_wikilocal('diary_header'), content_rx, line('$')+1, 1)
   else
@@ -278,7 +277,7 @@ function! vimwiki#diary#calendar_action(day, month, year, week, dir) "{{{
   endif
 
   " XXX: Well, +1 is for inconsistent index basing...
-  call vimwiki#diary#make_note(g:vimwiki_current_idx+1, 0, link)
+  call vimwiki#diary#make_note(vimwiki#vars#get_bufferlocal('wiki_nr')+1, 0, link)
 endfunction "}}}
 
 " Sign function.
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 17f64f1..671ddc1 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -231,7 +231,7 @@ function! s:is_html_uptodate(wikifile) "{{{
   endif
 
   let wikifile = fnamemodify(a:wikifile, ":p")
-  let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') . VimwikiGet('subdir') .
+  let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') . vimwiki#vars#get_bufferlocal('subdir') .
         \fnamemodify(wikifile, ":t:r").".html")
 
   if getftime(wikifile) <= getftime(htmlfile) && tpl_time <= getftime(htmlfile)
@@ -345,12 +345,12 @@ endfunction "}}}
 "   match n-th ARG within {{URL[|ARG1|ARG2|...]}} " {{{
 " *c,d,e),...
 function! vimwiki#html#incl_match_arg(nn_index)
-  let rx = g:vimwiki_rxWikiInclPrefix. g:vimwiki_rxWikiInclUrl
-  let rx = rx. repeat(g:vimwiki_rxWikiInclSeparator. g:vimwiki_rxWikiInclArg, a:nn_index-1)
+  let rx = vimwiki#vars#get_global('rxWikiInclPrefix'). vimwiki#vars#get_global('rxWikiInclUrl')
+  let rx = rx. repeat(vimwiki#vars#get_global('rxWikiInclSeparator'). vimwiki#vars#get_global('rxWikiInclArg'), a:nn_index-1)
   if a:nn_index > 0
-    let rx = rx. g:vimwiki_rxWikiInclSeparator. '\zs'. g:vimwiki_rxWikiInclArg. '\ze'
+    let rx = rx. vimwiki#vars#get_global('rxWikiInclSeparator'). '\zs'. vimwiki#vars#get_global('rxWikiInclArg'). '\ze'
   endif
-  let rx = rx. g:vimwiki_rxWikiInclArgs. g:vimwiki_rxWikiInclSuffix
+  let rx = rx. vimwiki#vars#get_global('rxWikiInclArgs'). vimwiki#vars#get_global('rxWikiInclSuffix')
   return rx
 endfunction
 "}}}
@@ -359,7 +359,7 @@ function! vimwiki#html#linkify_link(src, descr) "{{{
   let src_str = ' href="'.s:safe_html_anchor(a:src).'"'
   let descr = substitute(a:descr,'^\s*\(.*\)\s*$','\1','')
   let descr = (descr == "" ? a:src : descr)
-  let descr_str = (descr =~# g:vimwiki_rxWikiIncl
+  let descr_str = (descr =~# vimwiki#vars#get_global('rxWikiIncl')
         \ ? s:tag_wikiincl(descr) 
         \ : descr)
   return '<a'.src_str.'>'.descr_str.'</a>'
@@ -375,8 +375,8 @@ endfunction "}}}
 function! s:tag_weblink(value) "{{{
   " Weblink Template -> <a href="url">descr</a>
   let str = a:value
-  let url = matchstr(str, g:vimwiki_rxWeblinkMatchUrl)
-  let descr = matchstr(str, g:vimwiki_rxWeblinkMatchDescr)
+  let url = matchstr(str, vimwiki#vars#get_global('rxWeblinkMatchUrl'))
+  let descr = matchstr(str, vimwiki#vars#get_global('rxWeblinkMatchDescr'))
   let line = vimwiki#html#linkify_link(url, descr)
   return line
 endfunction "}}}
@@ -391,7 +391,7 @@ function! s:tag_wikiincl(value) "{{{
   let line = VimwikiWikiIncludeHandler(str)
   " otherwise, assume image transclusion
   if line == ''
-    let url_0 = matchstr(str, g:vimwiki_rxWikiInclMatchUrl)
+    let url_0 = matchstr(str, vimwiki#vars#get_global('rxWikiInclMatchUrl'))
     let descr = matchstr(str, vimwiki#html#incl_match_arg(1))
     let verbatim_str = matchstr(str, vimwiki#html#incl_match_arg(2))
 
@@ -424,8 +424,8 @@ function! s:tag_wikilink(value) "{{{
   " [[url#a1#a2]]             -> <a href="url.html#a1-a2">url#a1#a2</a>
   " [[#a1#a2]]                -> <a href="#a1-a2">#a1#a2</a>
   let str = a:value
-  let url = matchstr(str, g:vimwiki_rxWikiLinkMatchUrl)
-  let descr = matchstr(str, g:vimwiki_rxWikiLinkMatchDescr)
+  let url = matchstr(str, vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
+  let descr = matchstr(str, vimwiki#vars#get_global('rxWikiLinkMatchDescr'))
   let descr = (substitute(descr,'^\s*\(.*\)\s*$','\1','') != '' ? descr : url)
 
   let line = VimwikiLinkConverter(url, s:current_wiki_file,
@@ -514,16 +514,16 @@ function! s:make_tag(line, regexp, func, ...) "{{{
   " Exclude preformatted text and href links.
   " FIXME 
   let patt_splitter = '\(`[^`]\+`\)\|'.
-                    \ '\('.g:vimwiki_rxPreStart.'.\+'.g:vimwiki_rxPreEnd.'\)\|'.
+                    \ '\('.vimwiki#vars#get_syntaxlocal('rxPreStart').'.\+'.vimwiki#vars#get_syntaxlocal('rxPreEnd').'\)\|'.
                     \ '\(<a href.\{-}</a>\)\|'.
                     \ '\(<img src.\{-}/>\)\|'.
                     \ '\(<pre.\{-}</pre>\)\|'.
-      	            \ '\('.g:vimwiki_rxEqIn.'\)'
+                    \ '\('.vimwiki#vars#get_syntaxlocal('rxEqIn').'\)'
 
   "FIXME FIXME !!! these can easily occur on the same line!
   "XXX  {{{ }}} ??? obsolete
   if '`[^`]\+`' ==# a:regexp || '{{{.\+}}}' ==# a:regexp ||
-        \ g:vimwiki_rxEqIn ==# a:regexp
+        \ vimwiki#vars#get_syntaxlocal('rxEqIn') ==# a:regexp
     let res_line = s:subst_func(a:line, a:regexp, a:func)
   else
     let pos = 0
@@ -557,23 +557,23 @@ endfunction " }}}
 
 function! s:process_tags_typefaces(line, header_ids) "{{{
   let line = a:line
-  let line = s:make_tag(line, g:vimwiki_rxItalic, 's:tag_em')
-  let line = s:make_tag(line, g:vimwiki_rxBold, 's:tag_strong', a:header_ids)
-  let line = s:make_tag(line, g:vimwiki_rxTodo, 's:tag_todo')
-  let line = s:make_tag(line, g:vimwiki_rxDelText, 's:tag_strike')
-  let line = s:make_tag(line, g:vimwiki_rxSuperScript, 's:tag_super')
-  let line = s:make_tag(line, g:vimwiki_rxSubScript, 's:tag_sub')
-  let line = s:make_tag(line, g:vimwiki_rxCode, 's:tag_code')
-  let line = s:make_tag(line, g:vimwiki_rxEqIn, 's:tag_eqin')
-  let line = s:make_tag(line, g:vimwiki_rxTags, 's:tag_tags', a:header_ids)
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxItalic'), 's:tag_em')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxBold'), 's:tag_strong', a:header_ids)
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxTodo'), 's:tag_todo')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxDelText'), 's:tag_strike')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxSuperScript'), 's:tag_super')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxSubScript'), 's:tag_sub')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxCode'), 's:tag_code')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxEqIn'), 's:tag_eqin')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxTags'), 's:tag_tags', a:header_ids)
   return line
 endfunction " }}}
 
 function! s:process_tags_links(line) " {{{
   let line = a:line
-  let line = s:make_tag(line, g:vimwiki_rxWikiLink, 's:tag_wikilink')
-  let line = s:make_tag(line, g:vimwiki_rxWikiIncl, 's:tag_wikiincl')
-  let line = s:make_tag(line, g:vimwiki_rxWeblink, 's:tag_weblink')
+  let line = s:make_tag(line, vimwiki#vars#get_global('rxWikiLink'), 's:tag_wikilink')
+  let line = s:make_tag(line, vimwiki#vars#get_global('rxWikiIncl'), 's:tag_wikiincl')
+  let line = s:make_tag(line, vimwiki#vars#get_global('rxWeblink'), 's:tag_weblink')
   return line
 endfunction " }}}
 
@@ -859,7 +859,7 @@ function! s:process_tag_list(line, lists) "{{{
     let st_tag = '<li>'
     let chk = matchlist(a:line, a:rx_list)
     if !empty(chk) && len(chk[1]) > 0
-      let completion = index(g:vimwiki_listsyms_list, chk[1])
+      let completion = index(vimwiki#vars#get_syntaxlocal('listsyms_list'), chk[1])
       if completion >= 0 && completion <=4
         let st_tag = '<li class="done'.completion.'">'
       endif
@@ -873,7 +873,7 @@ function! s:process_tag_list(line, lists) "{{{
   " text.
   " XXX necessary? in *bold* text, no space must follow the first *
   if !in_list
-    let pos = match(a:line, '^\s*'.g:vimwiki_rxBold)
+    let pos = match(a:line, '^\s*'.vimwiki#vars#get_syntaxlocal('rxBold'))
     if pos != -1
       return [0, []]
     endif
@@ -994,12 +994,12 @@ function! s:process_tag_h(line, id) "{{{
   let h_text = ''
   let h_id = ''
 
-  if a:line =~# g:vimwiki_rxHeader
+  if a:line =~# vimwiki#vars#get_syntaxlocal('rxHeader')
     let h_level = vimwiki#u#count_first_sym(a:line)
   endif
   if h_level > 0
 
-    let h_text = vimwiki#u#trim(matchstr(line, g:vimwiki_rxHeader))
+    let h_text = vimwiki#u#trim(matchstr(line, vimwiki#vars#get_syntaxlocal('rxHeader')))
     let h_number = ''
     let h_complete_id = ''
     let h_id = s:safe_html_anchor(h_text)
@@ -1175,7 +1175,7 @@ function! s:parse_line(line, state) " {{{
   "}}}
 
   if !processed
-    if line =~# g:vimwiki_rxComment
+    if line =~# vimwiki#vars#get_syntaxlocal('rxComment')
       let processed = 1
     endif
   endif
@@ -1364,7 +1364,7 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
       \ (len(vimwiki#vars#get_wikilocal('template_path')) > 1 ? shellescape(expand(vimwiki#vars#get_wikilocal('template_path'))) : '-'). ' '.
       \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ? vimwiki#vars#get_wikilocal('template_default') : '-'). ' '.
       \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ? vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '.
-      \ (len(VimwikiGet('subdir'))           > 0 ? shellescape(s:root_path(VimwikiGet('subdir')))   : '-'))
+      \ (len(vimwiki#vars#get_bufferlocal('subdir'))           > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir')))   : '-'))
 endfunction " }}}
 
 function! s:convert_file(path_html, wikifile) "{{{
@@ -1372,7 +1372,7 @@ function! s:convert_file(path_html, wikifile) "{{{
 
   let wikifile = fnamemodify(a:wikifile, ":p")
 
-  let path_html = expand(a:path_html).VimwikiGet('subdir') 
+  let path_html = expand(a:path_html).vimwiki#vars#get_bufferlocal('subdir') 
   let htmlfile = fnamemodify(wikifile, ":t:r").'.html'
 
   " the currently processed file name is needed when processing links
@@ -1481,7 +1481,7 @@ function! s:convert_file(path_html, wikifile) "{{{
     " processing template variables (refactor to a function)
     call map(html_lines, 'substitute(v:val, "%title%", "'. title .'", "g")')
     call map(html_lines, 'substitute(v:val, "%root_path%", "'.
-          \ s:root_path(VimwikiGet('subdir')) .'", "g")')
+          \ s:root_path(vimwiki#vars#get_bufferlocal('subdir')) .'", "g")')
 
     let css_name = expand(vimwiki#vars#get_wikilocal('css_name'))
     let css_name = substitute(css_name, '\', '/', 'g')
@@ -1541,8 +1541,8 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
   setlocal nomore
 
   " temporarily adjust current_subdir global state variable
-  let current_subdir = VimwikiGet('subdir')
-  let current_invsubdir = VimwikiGet('invsubdir')
+  let current_subdir = vimwiki#vars#get_bufferlocal('subdir')
+  let current_invsubdir = vimwiki#vars#get_bufferlocal('invsubdir')
 
   let wikifiles = split(glob(vimwiki#vars#get_wikilocal('path').'**/*'.vimwiki#vars#get_wikilocal('ext')), '\n')
   for wikifile in wikifiles
@@ -1550,8 +1550,8 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
 
     " temporarily adjust 'subdir' and 'invsubdir' state variables
     let subdir = vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path'), wikifile)
-    call VimwikiSet('subdir', subdir)
-    call VimwikiSet('invsubdir', vimwiki#base#invsubdir(subdir))
+    call vimwiki#vars#set_bufferlocal('subdir', subdir)
+    call vimwiki#vars#set_bufferlocal('invsubdir', vimwiki#base#invsubdir(subdir))
 
     if !s:is_html_uptodate(wikifile)
       echomsg 'Vimwiki: Processing '.wikifile
@@ -1562,8 +1562,8 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
     endif
   endfor
   " reset 'subdir' state variable
-  call VimwikiSet('subdir', current_subdir)
-  call VimwikiSet('invsubdir', current_invsubdir)
+  call vimwiki#vars#set_bufferlocal('subdir', current_subdir)
+  call vimwiki#vars#set_bufferlocal('invsubdir', current_invsubdir)
 
   let created = s:create_default_CSS(path_html)
   if created
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 9f8ab32..fce1596 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -109,7 +109,7 @@ else
 endif "}}}
 
 function! vimwiki#lst#default_symbol() "{{{
-  return g:vimwiki_list_markers[0]
+  return vimwiki#vars#get_syntaxlocal('list_markers')[0]
 endfunction "}}}
 
 function! vimwiki#lst#get_list_margin() "{{{
@@ -124,16 +124,16 @@ endfunction "}}}
 "Returns: the column where the text of a line starts (possible list item
 "markers and checkboxes are skipped)
 function! s:text_begin(lnum) "{{{
-  return s:string_length(matchstr(getline(a:lnum), g:vimwiki_rxListItem))
+  return s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem')))
 endfunction "}}}
 
 "Returns: 2 if there is a marker and text
 " 1 for a marker and no text
 " 0 for no marker at all (empty line or only text)
 function! s:line_has_marker(lnum) "{{{
-  if getline(a:lnum) =~# g:vimwiki_rxListItem.'\s*$'
+  if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*$'
     return 1
-  elseif getline(a:lnum) =~# g:vimwiki_rxListItem.'\s*\S'
+  elseif getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*\S'
     return 2
   else
     return 0
@@ -157,7 +157,7 @@ function! s:get_item(lnum) "{{{
     return item
   endif
 
-  let matches = matchlist(getline(a:lnum), g:vimwiki_rxListItem)
+  let matches = matchlist(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem'))
   if matches == [] ||
         \ (matches[1] == '' && matches[2] == '') ||
         \ (matches[1] != '' && matches[2] != '')
@@ -377,10 +377,10 @@ endfunction "}}}
 "If there is no second argument, 0 is returned at a header, otherwise the
 "header is skipped
 function! s:get_next_line(lnum, ...) "{{{
-  if getline(a:lnum) =~# g:vimwiki_rxPreStart
+  if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
     let cur_ln = a:lnum + 1
     while cur_ln <= line('$') &&
-          \ getline(cur_ln) !~# g:vimwiki_rxPreEnd
+          \ getline(cur_ln) !~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
       let cur_ln += 1
     endwhile
     let next_line = cur_ln
@@ -388,12 +388,12 @@ function! s:get_next_line(lnum, ...) "{{{
     let next_line = nextnonblank(a:lnum+1)
   endif
 
-  if a:0 > 0 && getline(next_line) =~# g:vimwiki_rxHeader
+  if a:0 > 0 && getline(next_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader')
     let next_line = s:get_next_line(next_line, 1)
   endif
 
   if next_line < 0 || next_line > line('$') ||
-        \ (getline(next_line) =~# g:vimwiki_rxHeader && a:0 == 0)
+        \ (getline(next_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader') && a:0 == 0)
     return 0
   endif
 
@@ -405,10 +405,10 @@ endfunction "}}}
 function! s:get_prev_line(lnum) "{{{
   let prev_line = prevnonblank(a:lnum-1)
 
-  if getline(prev_line) =~# g:vimwiki_rxPreEnd
+  if getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
     let cur_ln = a:lnum - 1
     while 1
-      if cur_ln == 0 || getline(cur_ln) =~# g:vimwiki_rxPreStart
+      if cur_ln == 0 || getline(cur_ln) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
         break
       endif
       let cur_ln -= 1
@@ -417,7 +417,7 @@ function! s:get_prev_line(lnum) "{{{
   endif
 
   if prev_line < 0 || prev_line > line('$') ||
-        \ getline(prev_line) =~# g:vimwiki_rxHeader
+        \ getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader')
     return 0
   endif
 
@@ -694,7 +694,7 @@ function! s:get_rate(item) "{{{
     return -1
   endif
   let state = a:item.cb
-  return index(g:vimwiki_listsyms_list, state) * 25
+  return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 25
 endfunction "}}}
 
 "Set state of the list item to [ ] or [o] or whatever
@@ -731,15 +731,15 @@ endfunction "}}}
 function! s:rate_to_state(rate) "{{{
   let state = ''
   if a:rate == 100
-    let state = g:vimwiki_listsyms_list[4]
+    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[4]
   elseif a:rate == 0
-    let state = g:vimwiki_listsyms_list[0]
+    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[0]
   elseif a:rate >= 67
-    let state = g:vimwiki_listsyms_list[3]
+    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[3]
   elseif a:rate >= 34
-    let state = g:vimwiki_listsyms_list[2]
+    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[2]
   else
-    let state = g:vimwiki_listsyms_list[1]
+    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[1]
   endif
   return state
 endfunction "}}}
@@ -793,7 +793,7 @@ function! s:create_cb(item) "{{{
   endif
 
   let new_item = a:item
-  let new_item.cb = g:vimwiki_listsyms_list[0]
+  let new_item.cb = vimwiki#vars#get_syntaxlocal('listsyms_list')[0]
   call s:substitute_rx_in_line(new_item.lnum,
         \ vimwiki#u#escape(new_item.mrkr) . '\zs\ze', ' [' . new_item.cb . ']')
 
@@ -1081,31 +1081,33 @@ function! s:get_idx_list_markers(item) "{{{
   else
     let m = s:guess_kind_of_numbered_item(a:item) . a:item.mrkr[-1:]
   endif
-  return index(g:vimwiki_list_markers, m)
+  return index(vimwiki#vars#get_syntaxlocal('list_markers'), m)
 endfunction "}}}
 
 "changes the marker of the given item to the next in g:vimwiki_list_markers
 function! s:get_next_mrkr(item) "{{{
+  let markers = vimwiki#vars#get_syntaxlocal('list_markers')
   if a:item.type == 0
-    let new_mrkr = g:vimwiki_list_markers[0]
+    let new_mrkr = markers[0]
   else
     let idx = s:get_idx_list_markers(a:item)
-    let new_mrkr = g:vimwiki_list_markers[(idx+1) % len(g:vimwiki_list_markers)]
+    let new_mrkr = markers[(idx+1) % len(markers)]
   endif
   return new_mrkr
 endfunction "}}}
 
 "changes the marker of the given item to the previous in g:vimwiki_list_markers
 function! s:get_prev_mrkr(item) "{{{
+  let markers = vimwiki#vars#get_syntaxlocal('list_markers')
   if a:item.type == 0
-    return g:vimwiki_list_markers[-1]
+    return markers[-1]
   endif
   let idx = s:get_idx_list_markers(a:item)
   if idx == -1
-    return g:vimwiki_list_markers[-1]
+    return markers[-1]
   else
-    return g:vimwiki_list_markers[(idx - 1 + len(g:vimwiki_list_markers)) %
-          \ len(g:vimwiki_list_markers)]
+    return markers[(idx - 1 + len(markers)) %
+          \ len(markers)]
   endif
 endfunction "}}}
 
@@ -1260,7 +1262,7 @@ function! s:create_marker(lnum) "{{{
     call s:clone_marker_from_to(new_sibling.lnum, a:lnum)
   else
     let cur_item = s:get_item(a:lnum)
-    call s:set_new_mrkr(cur_item, g:vimwiki_list_markers[0])
+    call s:set_new_mrkr(cur_item, vimwiki#vars#get_syntaxlocal('list_markers')[0])
     call s:adjust_numbered_list(cur_item, 0, 0)
   endif
 endfunction "}}}
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index e35e8b0..7412176 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -17,20 +17,20 @@ function! vimwiki#markdown_base#scan_reflinks() " {{{
   " construct list of references using vimgrep
   try
     " Why noautocmd? Because https://github.com/vimwiki/vimwiki/issues/121
-    noautocmd execute 'vimgrep #'.g:vimwiki_rxMkdRef.'#j %'
+    noautocmd execute 'vimgrep #'.vimwiki#vars#get_syntaxlocal('rxMkdRef').'#j %'
   catch /^Vim\%((\a\+)\)\=:E480/   " No Match
     "Ignore it, and move on to the next file
   endtry
   " 
   for d in getqflist()
     let matchline = join(getline(d.lnum, min([d.lnum+1, line('$')])), ' ')
-    let descr = matchstr(matchline, g:vimwiki_rxMkdRefMatchDescr)
-    let url = matchstr(matchline, g:vimwiki_rxMkdRefMatchUrl)
+    let descr = matchstr(matchline, vimwiki#vars#get_syntaxlocal('rxMkdRefMatchDescr'))
+    let url = matchstr(matchline, vimwiki#vars#get_syntaxlocal('rxMkdRefMatchUrl'))
     if descr != '' && url != ''
       let mkd_refs[descr] = url
     endif
   endfor
-  call VimwikiSet('markdown_refs', mkd_refs)
+  call vimwiki#vars#set_bufferlocal('markdown_refs', mkd_refs)
   return mkd_refs
 endfunction "}}}
 
@@ -39,7 +39,7 @@ endfunction "}}}
 function! vimwiki#markdown_base#get_reflinks() " {{{
   let done = 1
   try
-    let mkd_refs = VimwikiGet('markdown_refs')
+    let mkd_refs = vimwiki#vars#get_bufferlocal('markdown_refs')
   catch
     " work-around hack
     let done = 0
@@ -92,17 +92,17 @@ function! vimwiki#markdown_base#follow_link(split, ...) "{{{ Parse link at curso
     endif
 
     " try WikiLink
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiLink),
-          \ g:vimwiki_rxWikiLinkMatchUrl)
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiLink')),
+          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
     " try WikiIncl
     if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiIncl),
-          \ g:vimwiki_rxWikiInclMatchUrl)
+      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
+          \ vimwiki#vars#get_global('rxWikiInclMatchUrl'))
     endif
     " try Weblink
     if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWeblink),
-            \ g:vimwiki_rxWeblinkMatchUrl)
+      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink')),
+            \ vimwiki#vars#get_global('rxWeblinkMatchUrl'))
     endif
 
     if lnk != ""
@@ -132,50 +132,50 @@ function! s:normalize_link_syntax_n() " {{{
   let lnum = line('.')
 
   " try WikiIncl
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiIncl)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl'))
   if !empty(lnk)
     " NO-OP !!
     return
   endif
 
   " try WikiLink0: replace with WikiLink1
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiLink0)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ g:vimwiki_rxWikiLinkMatchUrl, g:vimwiki_rxWikiLinkMatchDescr,
-          \ g:vimwiki_WikiLink1Template2)
-    call vimwiki#base#replacestr_at_cursor(g:vimwiki_rxWikiLink0, sub)
+          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('WikiLink1Template2'))
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'), sub)
     return
   endif
   
   " try WikiLink1: replace with WikiLink0
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWikiLink1)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ g:vimwiki_rxWikiLinkMatchUrl, g:vimwiki_rxWikiLinkMatchDescr,
-          \ g:vimwiki_WikiLinkTemplate2)
-    call vimwiki#base#replacestr_at_cursor(g:vimwiki_rxWikiLink1, sub)
+          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_global('WikiLinkTemplate2'))
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), sub)
     return
   endif
   
   " try Weblink
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWeblink)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ g:vimwiki_rxWeblinkMatchUrl, g:vimwiki_rxWeblinkMatchDescr,
-          \ g:vimwiki_Weblink1Template)
-    call vimwiki#base#replacestr_at_cursor(g:vimwiki_rxWeblink, sub)
+          \ vimwiki#vars#get_global('rxWeblinkMatchUrl'), vimwiki#vars#get_global('rxWeblinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('Weblink1Template'))
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_global('rxWeblink'), sub)
     return
   endif
 
   " try Word (any characters except separators)
   " rxWord is less permissive than rxWikiLinkUrl which is used in
   " normalize_link_syntax_v
-  let lnk = vimwiki#base#matchstr_at_cursor(g:vimwiki_rxWord)
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWord'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ g:vimwiki_rxWord, '',
-          \ g:vimwiki_Weblink1Template)
+          \ vimwiki#vars#get_global('rxWord'), '',
+          \ vimwiki#vars#get_syntaxlocal('Weblink1Template'))
     call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
     return
   endif
@@ -194,7 +194,7 @@ function! s:normalize_link_syntax_v() " {{{
   try
     norm! gvy
     let visual_selection = @"
-    let link = substitute(g:vimwiki_Weblink1Template, '__LinkUrl__', '\='."'".visual_selection."'", '')
+    let link = substitute(vimwiki#vars#get_syntaxlocal('Weblink1Template'), '__LinkUrl__', '\='."'".visual_selection."'", '')
     let link = substitute(link, '__LinkDescription__', '\='."'".visual_selection."'", '')
 
     call setreg('"', link, 'v')
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index 6a7b636..8b2c249 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -28,7 +28,7 @@ function! vimwiki#tags#update_tags(full_rebuild, all_files) "{{{
   let all_files = a:all_files != ''
   if !a:full_rebuild
     " Updating for one page (current)
-    let page_name = VimwikiGet('subdir') . expand('%:t:r')
+    let page_name = vimwiki#vars#get_bufferlocal('subdir') . expand('%:t:r')
     " Collect tags in current file
     let tags = s:scan_tags(getline(1, '$'), page_name)
     " Load metadata file
@@ -40,8 +40,8 @@ function! vimwiki#tags#update_tags(full_rebuild, all_files) "{{{
     " Save
     call s:write_tags_metadata(metadata)
   else " full rebuild
-    let files = vimwiki#base#find_files(g:vimwiki_current_idx, 0)
-    let wiki_base_dir = vimwiki#vars#get_wikilocal('path', g:vimwiki_current_idx)
+    let files = vimwiki#base#find_files(vimwiki#vars#get_bufferlocal('wiki_nr'), 0)
+    let wiki_base_dir = vimwiki#vars#get_wikilocal('path')
     let tags_file_last_modification =
           \ getftime(vimwiki#tags#metadata_file_path())
     let metadata = s:load_tags_metadata()
@@ -68,9 +68,8 @@ function! s:scan_tags(lines, page_name) "{{{
   " Code wireframe to scan for headers -- borrowed from
   " vimwiki#base#get_anchors(), with minor modifications.
 
-  let syntax = vimwiki#vars#get_wikilocal('syntax')
-  let rxheader = g:vimwiki_{syntax}_header_search
-  let rxtag = g:vimwiki_{syntax}_tag_search
+  let rxheader = vimwiki#vars#get_syntaxlocal('header_search')
+  let rxtag = vimwiki#vars#get_syntaxlocal('tag_search')
 
   let anchor_level = ['', '', '', '', '', '', '']
   let current_complete_anchor = ''
@@ -316,18 +315,18 @@ function! vimwiki#tags#generate_tags(...) abort "{{{
     if need_all_tags || index(specific_tags, tagname) != -1
       call extend(lines, [
             \ '',
-            \ substitute(g:vimwiki_rxH2_Template, '__Header__', tagname, ''),
+            \ substitute(vimwiki#vars#get_syntaxlocal('rxH2_Template'), '__Header__', tagname, ''),
             \ '' ])
       for taglink in sort(tags_entries[tagname])
         call add(lines, bullet .
-              \ substitute(g:vimwiki_WikiLinkTemplate1, '__LinkUrl__', taglink, ''))
+              \ substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', taglink, ''))
       endfor
     endif
   endfor
 
-  let links_rx = '\m\%(^\s*$\)\|\%('.g:vimwiki_rxH2.'\)\|\%(^\s*'
+  let links_rx = '\m\%(^\s*$\)\|\%('.vimwiki#vars#get_syntaxlocal('rxH2').'\)\|\%(^\s*'
         \ .vimwiki#u#escape(vimwiki#lst#default_symbol()).' '
-        \ .g:vimwiki_rxWikiLink.'$\)'
+        \ .vimwiki#vars#get_global('rxWikiLink').'$\)'
 
   call vimwiki#base#update_listing_in_buffer(lines, 'Generated Tags', links_rx,
         \ line('$')+1, 1)
diff --git a/autoload/vimwiki/tbl.vim b/autoload/vimwiki/tbl.vim
index 05204fe..d9c7134 100644
--- a/autoload/vimwiki/tbl.vim
+++ b/autoload/vimwiki/tbl.vim
@@ -19,7 +19,7 @@ let s:textwidth = &tw
 
 " Misc functions {{{
 function! s:rxSep() "{{{
-  return g:vimwiki_rxTableSep
+  return vimwiki#vars#get_syntaxlocal('rxTableSep')
 endfunction "}}}
 
 function! s:wide_len(str) "{{{
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index b13c147..d34a032 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -401,11 +401,18 @@ function! vimwiki#vars#get_bufferlocal(key)
   elseif a:key ==# 'wiki_nr'
     let b:vimwiki_wiki_nr = vimwiki#base#find_wiki(expand('%:p'))
     return b:vimwiki_wiki_nr
+  elseif a:key ==# 'subdir'
+    let b:vimwiki_subdir = vimwiki#base#current_subdir()
+    return b:vimwiki_subdir
+  elseif a:key ==# 'invsubdir'
+    let subdir = vimwiki#vars#get_bufferlocal('subdir')
+    let b:vimwiki_invsubdir = vimwiki#base#invsubdir(subdir)
+    return b:vimwiki_invsubdir
   endif
 endfunction
 
 
-function! vimwiki#vars#set_buffer_var(key, value)
+function! vimwiki#vars#set_bufferlocal(key, value)
   let b:vimwiki_{a:key} = a:value
 endfunction
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index b9f74e3..e5763f3 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -86,7 +86,7 @@ function! Complete_wikifiles(findstart, base)
         let prefix = matchstr(a:base, '^diary:\zs.*')
         let scheme = matchstr(a:base, '^diary:\ze')
       else " current wiki
-        let wikinumber = g:vimwiki_current_idx
+        let wikinumber = vimwiki#vars#get_bufferlocal('wiki_nr')
         let prefix = a:base
         let scheme = ''
       endif
@@ -168,12 +168,12 @@ function! VimwikiFoldLevel(lnum) "{{{
   let line = getline(a:lnum)
 
   " Header/section folding...
-  if line =~# g:vimwiki_rxHeader
+  if line =~# vimwiki#vars#get_syntaxlocal('rxHeader')
     return '>'.vimwiki#u#count_first_sym(line)
   " Code block folding...
-  elseif line =~# g:vimwiki_rxPreStart
+  elseif line =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
     return 'a1'
-  elseif line =~# g:vimwiki_rxPreEnd
+  elseif line =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
     return 's1'
   else
     return "="
@@ -219,7 +219,7 @@ function! VimwikiFoldText() "{{{
   let main_text = substitute(line, '^\s*', repeat(' ',indent(v:foldstart)), '')
   let fold_len = v:foldend - v:foldstart + 1
   let len_text = ' ['.fold_len.'] '
-  if line !~# g:vimwiki_rxPreStart
+  if line !~# vimwiki#vars#get_syntaxlocal('rxPreStart')
     let [main_text, spare_len] = s:shorten_text(main_text, 50)
     return main_text.len_text
   else
diff --git a/syntax/omnipresent_syntax.vim b/syntax/omnipresent_syntax.vim
deleted file mode 100644
index aaf3545..0000000
--- a/syntax/omnipresent_syntax.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki syntax file
-" Desc: Syntax definitions which are always available
-" Home: https://github.com/vimwiki/vimwiki/
-
-
-" Define Regexes of anchors for every syntax.
-" This has to be separated from vimwiki_default.vim, vimwiki_markdown.vim, etc.
-" because the latter are only loaded and available if the current wiki has the
-" corresponding syntax
-let g:vimwiki_default_header_search = '^\s*\(=\{1,6}\)\([^=].*[^=]\)\1\s*$'
-let g:vimwiki_default_header_match = '^\s*\(=\{1,6}\)=\@!\s*__Header__\s*\1=\@!\s*$'
-let g:vimwiki_default_bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_default_bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_default_wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]'
-let g:vimwiki_default_tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)'
-let g:vimwiki_default_tag_match =  '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)'
-
-let g:vimwiki_markdown_header_search = '^\s*\(#\{1,6}\)\([^#].*\)$'
-let g:vimwiki_markdown_header_match = '^\s*\(#\{1,6}\)#\@!\s*__Header__\s*$'
-let g:vimwiki_markdown_bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_markdown_bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_markdown_wikilink = g:vimwiki_default_wikilink "XXX plus markdown-style links
-let g:vimwiki_markdown_tag_search = g:vimwiki_default_tag_search
-let g:vimwiki_markdown_tag_match = g:vimwiki_default_tag_match
-
-let g:vimwiki_media_header_search = '^\s*\(=\{1,6}\)\([^=].*[^=]\)\1\s*$'
-let g:vimwiki_media_header_match = '^\s*\(=\{1,6}\)=\@!\s*__Header__\s*\1=\@!\s*$'
-let g:vimwiki_media_bold_search = "'''\\zs[^']\\+\\ze'''"
-let g:vimwiki_media_bold_match = '''''''__Text__'''''''
-" ^- this strange looking thing is equivalent to "'''__Text__'''" but since we later
-" want to call escape() on this string, we must keep it in single quotes
-let g:vimwiki_media_wikilink = g:vimwiki_default_wikilink
-let g:vimwiki_media_tag_search = g:vimwiki_default_tag_search " XXX rework to mediawiki categories format?
-let g:vimwiki_media_tag_match = g:vimwiki_default_tag_match " XXX rework to mediawiki categories format?
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 54e241e..d181b95 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -3,86 +3,97 @@
 " Desc: Defines markdown syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
+" see the comments in vimwiki_default.vim for some info about this file
+
+let s:markdown_syntax = g:vimwiki_syntax_variables['markdown']
+
 " text: $ equation_inline $
-let g:vimwiki_rxEqIn = '\$[^$`]\+\$'
-let g:vimwiki_char_eqin = '\$'
+let s:markdown_syntax.rxEqIn = '\$[^$`]\+\$'
+let s:markdown_syntax.char_eqin = '\$'
 
 " text: *strong*
-" let g:vimwiki_rxBold = '\*[^*]\+\*'
-let g:vimwiki_rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
+" let s:markdown_syntax.rxBold = '\*[^*]\+\*'
+let s:markdown_syntax.rxBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'\*'.
       \'\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)'.
       \'\*'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_bold = '*'
+let s:markdown_syntax.char_bold = '*'
 
 " text: _emphasis_
-" let g:vimwiki_rxItalic = '_[^_]\+_'
-let g:vimwiki_rxItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
+" let s:markdown_syntax.rxItalic = '_[^_]\+_'
+let s:markdown_syntax.rxItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'_'.
       \'\%([^_`[:space:]][^_`]*[^_`[:space:]]\|[^_`[:space:]]\)'.
       \'_'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_italic = '_'
+let s:markdown_syntax.char_italic = '_'
 
 " text: *_bold italic_* or _*italic bold*_
-let g:vimwiki_rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
+let s:markdown_syntax.rxBoldItalic = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'\*_'.
       \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
       \'_\*'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_bolditalic = '\*_'
+let s:markdown_syntax.char_bolditalic = '\*_'
 
-let g:vimwiki_rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
+let s:markdown_syntax.rxItalicBold = '\%(^\|\s\|[[:punct:]]\)\@<='.
       \'_\*'.
       \'\%([^*_`[:space:]][^*_`]*[^*_`[:space:]]\|[^*_`[:space:]]\)'.
       \'\*_'.
       \'\%([[:punct:]]\|\s\|$\)\@='
-let g:vimwiki_char_italicbold = '_\*'
+let s:markdown_syntax.char_italicbold = '_\*'
 
 " text: `code`
-let g:vimwiki_rxCode = '`[^`]\+`'
-let g:vimwiki_char_code = '`'
+let s:markdown_syntax.rxCode = '`[^`]\+`'
+let s:markdown_syntax.char_code = '`'
 
 " text: ~~deleted text~~
-let g:vimwiki_rxDelText = '\~\~[^~`]\+\~\~'
-let g:vimwiki_char_deltext = '\~\~'
+let s:markdown_syntax.rxDelText = '\~\~[^~`]\+\~\~'
+let s:markdown_syntax.char_deltext = '\~\~'
 
 " text: ^superscript^
-let g:vimwiki_rxSuperScript = '\^[^^`]\+\^'
-let g:vimwiki_char_superscript = '^'
+let s:markdown_syntax.rxSuperScript = '\^[^^`]\+\^'
+let s:markdown_syntax.char_superscript = '^'
 
 " text: ,,subscript,,
-let g:vimwiki_rxSubScript = ',,[^,`]\+,,'
-let g:vimwiki_char_subscript = ',,'
+let s:markdown_syntax.rxSubScript = ',,[^,`]\+,,'
+let s:markdown_syntax.char_subscript = ',,'
 
 " generic headers
-let g:vimwiki_rxH = '#'
-let g:vimwiki_symH = 0
+let s:markdown_syntax.rxH = '#'
+let s:markdown_syntax.symH = 0
 
 
 
 " <hr>, horizontal rule
-let g:vimwiki_rxHR = '^-----*$'
+let s:markdown_syntax.rxHR = '^-----*$'
 
 " Tables. Each line starts and ends with '|'; each cell is separated by '|'
-let g:vimwiki_rxTableSep = '|'
+let s:markdown_syntax.rxTableSep = '|'
 
 " Lists
-let g:vimwiki_bullet_types = ['-', '*', '+']
-let s:media_syntax.recurring_bullets = 0
-let g:vimwiki_number_types = ['1.']
-let g:vimwiki_list_markers = ['-', '*', '+', '1.']
-let g:vimwiki_rxListDefine = '::\%(\s\|$\)'
-call vimwiki#lst#setup_marker_infos()
+let s:markdown_syntax.bullet_types = ['-', '*', '+']
+let s:markdown_syntax.recurring_bullets = 0
+let s:markdown_syntax.number_types = ['1.']
+let s:markdown_syntax.list_markers = ['-', '*', '+', '1.']
+let s:markdown_syntax.rxListDefine = '::\%(\s\|$\)'
 
 " Preformatted text
-let g:vimwiki_rxPreStart = '```'
-let g:vimwiki_rxPreEnd = '```'
+let s:markdown_syntax.rxPreStart = '```'
+let s:markdown_syntax.rxPreEnd = '```'
 
 " Math block
-let g:vimwiki_rxMathStart = '\$\$'
-let g:vimwiki_rxMathEnd = '\$\$'
+let s:markdown_syntax.rxMathStart = '\$\$'
+let s:markdown_syntax.rxMathEnd = '\$\$'
 
-let g:vimwiki_rxComment = '^\s*%%.*$'
-let g:vimwiki_rxTags = '\%(^\|\s\)\@<=:\%([^:[:space:]]\+:\)\+\%(\s\|$\)\@='
+let s:markdown_syntax.rxComment = '^\s*%%.*$'
+let s:markdown_syntax.rxTags = '\%(^\|\s\)\@<=:\%([^:[:space:]]\+:\)\+\%(\s\|$\)\@='
+
+let s:markdown_syntax.header_search = '^\s*\(#\{1,6}\)\([^#].*\)$'
+let s:markdown_syntax.header_match = '^\s*\(#\{1,6}\)#\@!\s*__Header__\s*$'
+let s:markdown_syntax.bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
+let s:markdown_syntax.bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*\%([[:punct:]]\|\s\|$\)\@='
+let s:markdown_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]' "XXX plus markdown-style links
+let s:markdown_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)'
+let s:markdown_syntax.tag_match = '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)'
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index 9b3ff12..dfdc9d9 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -3,67 +3,80 @@
 " Desc: Defines mediaWiki syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
+" see the comments in vimwiki_default.vim for some info about this file
+
+let s:media_syntax = g:vimwiki_syntax_variables['media']
+
 " text: $ equation_inline $
-let g:vimwiki_rxEqIn = '\$[^$`]\+\$'
-let g:vimwiki_char_eqin = '\$'
+let s:media_syntax.rxEqIn = '\$[^$`]\+\$'
+let s:media_syntax.char_eqin = '\$'
 
 " text: '''strong'''
-let g:vimwiki_rxBold = "'''[^']\\+'''"
-let g:vimwiki_char_bold = "'''"
+let s:media_syntax.rxBold = "'''[^']\\+'''"
+let s:media_syntax.char_bold = "'''"
 
 " text: ''emphasis''
-let g:vimwiki_rxItalic = "''[^']\\+''"
-let g:vimwiki_char_italic = "''"
+let s:media_syntax.rxItalic = "''[^']\\+''"
+let s:media_syntax.char_italic = "''"
 
 " text: '''''strong italic'''''
-let g:vimwiki_rxBoldItalic = "'''''[^']\\+'''''"
-let g:vimwiki_rxItalicBold = g:vimwiki_rxBoldItalic
-let g:vimwiki_char_bolditalic = "'''''"
-let g:vimwiki_char_italicbold = g:vimwiki_char_bolditalic
+let s:media_syntax.rxBoldItalic = "'''''[^']\\+'''''"
+let s:media_syntax.rxItalicBold = s:media_syntax.rxBoldItalic
+let s:media_syntax.char_bolditalic = "'''''"
+let s:media_syntax.char_italicbold = s:media_syntax.char_bolditalic
 
 " text: `code`
-let g:vimwiki_rxCode = '`[^`]\+`'
-let g:vimwiki_char_code = '`'
+let s:media_syntax.rxCode = '`[^`]\+`'
+let s:media_syntax.char_code = '`'
 
 " text: ~~deleted text~~
-let g:vimwiki_rxDelText = '\~\~[^~]\+\~\~'
-let g:vimwiki_char_deltext = '\~\~'
+let s:media_syntax.rxDelText = '\~\~[^~]\+\~\~'
+let s:media_syntax.char_deltext = '\~\~'
 
 " text: ^superscript^
-let g:vimwiki_rxSuperScript = '\^[^^]\+\^'
-let g:vimwiki_char_superscript = '^'
+let s:media_syntax.rxSuperScript = '\^[^^]\+\^'
+let s:media_syntax.char_superscript = '^'
 
 " text: ,,subscript,,
-let g:vimwiki_rxSubScript = ',,[^,]\+,,'
-let g:vimwiki_char_subscript = ',,'
+let s:media_syntax.rxSubScript = ',,[^,]\+,,'
+let s:media_syntax.char_subscript = ',,'
 
 " generic headers
-let g:vimwiki_rxH = '='
-let g:vimwiki_symH = 1
+let s:media_syntax.rxH = '='
+let s:media_syntax.symH = 1
 
 
 
 " <hr>, horizontal rule
-let g:vimwiki_rxHR = '^-----*$'
+let s:media_syntax.rxHR = '^-----*$'
 
 " Tables. Each line starts and ends with '|'; each cell is separated by '|'
-let g:vimwiki_rxTableSep = '|'
+let s:media_syntax.rxTableSep = '|'
 
 " Lists
-let g:vimwiki_bullet_types = ['*', '#']
+let s:media_syntax.bullet_types = ['*', '#']
 let s:media_syntax.recurring_bullets = 1
-let g:vimwiki_number_types = []
-let g:vimwiki_list_markers = ['*', '#']
-let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'
-call vimwiki#lst#setup_marker_infos()
+let s:media_syntax.number_types = []
+let s:media_syntax.list_markers = ['*', '#']
+let s:media_syntax.rxListDefine = '^\%(;\|:\)\s'
 
 " Preformatted text
-let g:vimwiki_rxPreStart = '<pre>'
-let g:vimwiki_rxPreEnd = '<\/pre>'
+let s:media_syntax.rxPreStart = '<pre>'
+let s:media_syntax.rxPreEnd = '<\/pre>'
 
 " Math block
-let g:vimwiki_rxMathStart = '{{\$'
-let g:vimwiki_rxMathEnd = '}}\$'
+let s:media_syntax.rxMathStart = '{{\$'
+let s:media_syntax.rxMathEnd = '}}\$'
 
-let g:vimwiki_rxComment = '^\s*%%.*$'
-let g:vimwiki_rxTags = '\%(^\|\s\)\@<=:\%([^:[:space:]]\+:\)\+\%(\s\|$\)\@='
+let s:media_syntax.rxComment = '^\s*%%.*$'
+let s:media_syntax.rxTags = '\%(^\|\s\)\@<=:\%([^:[:space:]]\+:\)\+\%(\s\|$\)\@='
+
+let s:media_syntax.header_search = '^\s*\(=\{1,6}\)\([^=].*[^=]\)\1\s*$'
+let s:media_syntax.header_match = '^\s*\(=\{1,6}\)=\@!\s*__Header__\s*\1=\@!\s*$'
+let s:media_syntax.bold_search = "'''\\zs[^']\\+\\ze'''"
+let s:media_syntax.bold_match = '''''''__Text__'''''''
+" ^- this strange looking thing is equivalent to "'''__Text__'''" but since we later
+" want to call escape() on this string, we must keep it in single quotes
+let s:media_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]'
+let s:media_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)' " XXX rework to mediawiki categories format?
+let s:media_syntax.tag_match = '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)' " XXX rework to mediawiki categories format?

From b61ff8b5ee1e00057adc31bfdae8f4bc001300bd Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 11 Jan 2017 22:12:33 +0100
Subject: [PATCH 017/108] Start refactoring the rest -- part 6

Ref #256
---
 autoload/vimwiki/base.vim          |  20 ++---
 autoload/vimwiki/html.vim          |   4 +-
 autoload/vimwiki/markdown_base.vim |  10 +--
 autoload/vimwiki/tags.vim          |   2 +-
 autoload/vimwiki/u.vim             |   5 --
 autoload/vimwiki/vars.vim          | 130 ++++++++++++++++++++++++-----
 syntax/vimwiki.vim                 |   4 +-
 syntax/vimwiki_markdown_custom.vim | 100 +---------------------
 8 files changed, 131 insertions(+), 144 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 14592cf..81c9c45 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -824,7 +824,7 @@ function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
   let new_fname = a:new_fname
 
   let old_fname_r = vimwiki#base#apply_template(
-        \ vimwiki#vars#get_global('WikiLinkMatchUrlTemplate'), old_fname, '', '')
+        \ vimwiki#vars#get_syntaxlocal('WikiLinkMatchUrlTemplate'), old_fname, '', '')
 
   let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.vimwiki#vars#get_wikilocal('ext')), '\n')
   for fname in files
@@ -1056,7 +1056,7 @@ endfunction "}}}
 " WIKI link following functions {{{
 " vimwiki#base#find_next_link
 function! vimwiki#base#find_next_link() "{{{
-  call vimwiki#base#search_word(vimwiki#vars#get_global('rxAnyLink'), '')
+  call vimwiki#base#search_word(vimwiki#vars#get_syntaxlocal('rxAnyLink'), '')
 endfunction " }}}
 
 " vimwiki#base#find_prev_link
@@ -1064,9 +1064,9 @@ function! vimwiki#base#find_prev_link() "{{{
   "Jump 2 times if the cursor is in the middle of a link
   if synIDattr(synID(line('.'), col('.'), 0), "name") =~# "VimwikiLink.*" &&
         \ synIDattr(synID(line('.'), col('.')-1, 0), "name") =~# "VimwikiLink.*"
-    call vimwiki#base#search_word(vimwiki#vars#get_global('rxAnyLink'), 'b')
+    call vimwiki#base#search_word(vimwiki#vars#get_syntaxlocal('rxAnyLink'), 'b')
   endif
-  call vimwiki#base#search_word(vimwiki#vars#get_global('rxAnyLink'), 'b')
+  call vimwiki#base#search_word(vimwiki#vars#get_syntaxlocal('rxAnyLink'), 'b')
 endfunction " }}}
 
 " vimwiki#base#follow_link
@@ -1094,8 +1094,8 @@ function! vimwiki#base#follow_link(split, ...) "{{{ Parse link at cursor and pas
     endif
 
     " try WikiLink
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiLink')),
-          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink')),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
     " try WikiIncl
     if lnk == ""
       let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
@@ -1221,7 +1221,7 @@ function! vimwiki#base#rename_link() "{{{
     return
   endif
 
-  let url = matchstr(new_link, vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
+  let url = matchstr(new_link, vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
   if url != ''
     let new_link = url
   endif
@@ -1763,12 +1763,12 @@ endfunction " }}}
 function! s:normalize_link_syntax_n() " {{{
 
   " try WikiLink
-  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiLink'))
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_global('WikiLinkTemplate2'))
-    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_global('rxWikiLink'), sub)
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink'), sub)
     return
   endif
   
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 671ddc1..944e857 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -424,7 +424,7 @@ function! s:tag_wikilink(value) "{{{
   " [[url#a1#a2]]             -> <a href="url.html#a1-a2">url#a1#a2</a>
   " [[#a1#a2]]                -> <a href="#a1-a2">#a1#a2</a>
   let str = a:value
-  let url = matchstr(str, vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
+  let url = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
   let descr = matchstr(str, vimwiki#vars#get_global('rxWikiLinkMatchDescr'))
   let descr = (substitute(descr,'^\s*\(.*\)\s*$','\1','') != '' ? descr : url)
 
@@ -571,7 +571,7 @@ endfunction " }}}
 
 function! s:process_tags_links(line) " {{{
   let line = a:line
-  let line = s:make_tag(line, vimwiki#vars#get_global('rxWikiLink'), 's:tag_wikilink')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxWikiLink'), 's:tag_wikilink')
   let line = s:make_tag(line, vimwiki#vars#get_global('rxWikiIncl'), 's:tag_wikiincl')
   let line = s:make_tag(line, vimwiki#vars#get_global('rxWeblink'), 's:tag_weblink')
   return line
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index 7412176..429e2c5 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -8,7 +8,7 @@
 
 " vimwiki#markdown_base#reset_mkd_refs
 function! vimwiki#markdown_base#reset_mkd_refs() "{{{
-  call VimwikiClear('markdown_refs')
+  call vimwiki#vars#set_bufferlocal('markdown_refs', {})
 endfunction "}}}
 
 " vimwiki#markdown_base#scan_reflinks
@@ -92,8 +92,8 @@ function! vimwiki#markdown_base#follow_link(split, ...) "{{{ Parse link at curso
     endif
 
     " try WikiLink
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiLink')),
-          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'))
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink')),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
     " try WikiIncl
     if lnk == ""
       let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
@@ -142,7 +142,7 @@ function! s:normalize_link_syntax_n() " {{{
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_syntaxlocal('WikiLink1Template2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'), sub)
     return
@@ -152,7 +152,7 @@ function! s:normalize_link_syntax_n() " {{{
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_global('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_global('WikiLinkTemplate2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), sub)
     return
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index 8b2c249..490b47d 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -326,7 +326,7 @@ function! vimwiki#tags#generate_tags(...) abort "{{{
 
   let links_rx = '\m\%(^\s*$\)\|\%('.vimwiki#vars#get_syntaxlocal('rxH2').'\)\|\%(^\s*'
         \ .vimwiki#u#escape(vimwiki#lst#default_symbol()).' '
-        \ .vimwiki#vars#get_global('rxWikiLink').'$\)'
+        \ .vimwiki#vars#get_syntaxlocal('rxWikiLink').'$\)'
 
   call vimwiki#base#update_listing_in_buffer(lines, 'Generated Tags', links_rx,
         \ line('$')+1, 1)
diff --git a/autoload/vimwiki/u.vim b/autoload/vimwiki/u.vim
index fa91bf7..009bf9d 100644
--- a/autoload/vimwiki/u.vim
+++ b/autoload/vimwiki/u.vim
@@ -46,11 +46,6 @@ function vimwiki#u#reload_regexes() "{{{
   execute 'runtime! syntax/vimwiki_'.vimwiki#vars#get_wikilocal('syntax').'.vim'
 endfunction "}}}
 
-" Load omnipresent Wiki syntax
-function vimwiki#u#reload_omni_regexes() "{{{
-  execute 'runtime! syntax/omnipresent_syntax.vim'
-endfunction "}}}
-
 " Load syntax-specific functionality
 function vimwiki#u#reload_regexes_custom() "{{{
   execute 'runtime! syntax/vimwiki_'.vimwiki#vars#get_wikilocal('syntax').'_custom.vim'
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index d34a032..0d915df 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -95,18 +95,6 @@ function! s:populate_global_variables()
   let g:vimwiki_global_vars.WikiLinkTemplate2 = wikilink_prefix . '__LinkUrl__'. wikilink_separator
         \ . '__LinkDescription__' . wikilink_suffix
 
-  " template for matching all wiki links with a given target file
-  let g:vimwiki_global_vars.WikiLinkMatchUrlTemplate =
-        \ g:vimwiki_global_vars.rx_wikilink_prefix .
-        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-        \ g:vimwiki_global_vars.rx_wikilink_suffix .
-        \ '\|' .
-        \ g:vimwiki_global_vars.rx_wikilink_prefix .
-        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-        \ g:vimwiki_global_vars.rx_wikilink_separator .
-        \ '.*' .
-        \ g:vimwiki_global_vars.rx_wikilink_suffix
-
   let valid_chars = '[^\\\]]'
   let g:vimwiki_global_vars.rxWikiLinkUrl = valid_chars.'\{-}'
   let g:vimwiki_global_vars.rxWikiLinkDescr = valid_chars.'\{-}'
@@ -118,14 +106,6 @@ function! s:populate_global_variables()
   let g:vimwiki_global_vars.rxWord = '[^[:blank:]!"$%&''()*+,:;<=>?\[\]\\^`{}]\+'
 
   " [[URL]], or [[URL|DESCRIPTION]]
-  " a) match [[URL|DESCRIPTION]]
-  let g:vimwiki_global_vars.rxWikiLink = g:vimwiki_global_vars.rx_wikilink_prefix.
-        \ g:vimwiki_global_vars.rxWikiLinkUrl.'\%('.g:vimwiki_global_vars.rx_wikilink_separator.
-        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
-  " b) match URL within [[URL|DESCRIPTION]]
-  let g:vimwiki_global_vars.rxWikiLinkMatchUrl = g:vimwiki_global_vars.rx_wikilink_prefix.
-        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkUrl.'\ze\%('. g:vimwiki_global_vars.rx_wikilink_separator.
-        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
   " c) match DESCRIPTION within [[URL|DESCRIPTION]]
   let g:vimwiki_global_vars.rxWikiLinkMatchDescr = g:vimwiki_global_vars.rx_wikilink_prefix.
         \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator.'\%('.
@@ -176,9 +156,6 @@ function! s:populate_global_variables()
   " 0b) match DESCRIPTION within URL
   let g:vimwiki_global_vars.rxWeblinkMatchDescr = ''
 
-  let g:vimwiki_global_vars.rxAnyLink = g:vimwiki_global_vars.rxWikiLink.'\|'.
-      \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_global_vars.rxWeblink
-
   let g:vimwiki_global_vars.rxTodo = '\C\%(TODO:\|DONE:\|STARTED:\|FIXME:\|FIXED:\|XXX:\)'
 
   " default colors when headers of different levels are highlighted differently
@@ -370,6 +347,113 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   else
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'.g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['.g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
   endif
+
+  " template for matching all wiki links with a given target file
+  let g:vimwiki_syntax_variables[a:syntax].WikiLinkMatchUrlTemplate =
+        \ g:vimwiki_global_vars.rx_wikilink_prefix .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+        \ g:vimwiki_global_vars.rx_wikilink_suffix .
+        \ '\|' .
+        \ g:vimwiki_global_vars.rx_wikilink_prefix .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+        \ g:vimwiki_global_vars.rx_wikilink_separator .
+        \ '.*' .
+        \ g:vimwiki_global_vars.rx_wikilink_suffix
+
+  " a) match [[URL|DESCRIPTION]]
+  let g:vimwiki_syntax_variables[a:syntax].rxWikiLink = g:vimwiki_global_vars.rx_wikilink_prefix.
+        \ g:vimwiki_global_vars.rxWikiLinkUrl.'\%('.g:vimwiki_global_vars.rx_wikilink_separator.
+        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
+  let g:vimwiki_syntax_variables[a:syntax].rxAnyLink = g:vimwiki_syntax_variables[a:syntax].rxWikiLink.'\|'.
+      \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_global_vars.rxWeblink
+  " b) match URL within [[URL|DESCRIPTION]]
+  let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchUrl = g:vimwiki_global_vars.rx_wikilink_prefix.
+        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkUrl.'\ze\%('. g:vimwiki_global_vars.rx_wikilink_separator.
+        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
+
+  if a:syntax ==# 'markdown'
+    call s:populate_extra_markdown_vars()
+  endif
+endfunction
+
+
+function! s:populate_extra_markdown_vars()
+  let mkd_syntax = g:vimwiki_syntax_variables['markdown']
+
+  " 0a) match [[URL|DESCRIPTION]]
+  let mkd_syntax.vimwiki_rxWikiLink0 = mkd_syntax.rxWikiLink
+  " 0b) match URL within [[URL|DESCRIPTION]]
+  let mkd_syntax.vimwiki_rxWikiLink0MatchUrl = mkd_syntax.rxWikiLinkMatchUrl
+  " 0c) match DESCRIPTION within [[URL|DESCRIPTION]]
+  let mkd_syntax.vimwiki_rxWikiLink0MatchDescr = g:vimwiki_global_vars.rxWikiLinkMatchDescr
+
+  let wikilink_md_prefix = '['
+  let wikilink_md_suffix = ']'
+  let wikilink_md_separator = ']['
+  let rx_wikilink_md_separator = vimwiki#u#escape(wikilink_md_separator)
+  let mkd_syntax.rx_wikilink_md_prefix = vimwiki#u#escape(wikilink_md_prefix)
+  let mkd_syntax.rx_wikilink_md_suffix = vimwiki#u#escape(wikilink_md_suffix)
+
+  " [URL][]
+  let mkd_syntax.WikiLink1Template1 = wikilink_md_prefix . '__LinkUrl__'.
+        \ wikilink_md_separator. wikilink_md_suffix
+  " [DESCRIPTION][URL]
+  let mkd_syntax.WikiLink1Template2 = wikilink_md_prefix. '__LinkDescription__'.
+        \ wikilink_md_separator. '__LinkUrl__'. wikilink_md_suffix
+  let mkd_syntax.WikiLinkMatchUrlTemplate .=
+      \ '\|' .
+      \ mkd_syntax.rx_wikilink_md_prefix .
+      \ '.*' .
+      \ rx_wikilink_md_separator .
+      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+      \ mkd_syntax.rx_wikilink_md_suffix .
+      \ '\|' .
+      \ mkd_syntax.rx_wikilink_md_prefix .
+      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+      \ rx_wikilink_md_separator .
+      \ mkd_syntax.rx_wikilink_md_suffix
+
+let valid_chars = '[^\\\[\]]'
+let mkd_syntax.rxWikiLink1Url = valid_chars.'\{-}'
+let mkd_syntax.rxWikiLink1Descr = valid_chars.'\{-}'
+let mkd_syntax.rxWikiLink1InvalidPrefix = '[\]\[]\@<!'
+let mkd_syntax.rxWikiLink1InvalidSuffix = '[\]\[]\@!'
+let mkd_syntax.rx_wikilink_md_prefix = mkd_syntax.rxWikiLink1InvalidPrefix.
+      \ mkd_syntax.rx_wikilink_md_prefix
+let mkd_syntax.rx_wikilink_md_suffix = mkd_syntax.rx_wikilink_md_suffix.
+      \ mkd_syntax.rxWikiLink1InvalidSuffix
+
+" 1. match [URL][], [DESCRIPTION][URL]
+let mkd_syntax.rxWikiLink1 = mkd_syntax.rx_wikilink_md_prefix.
+    \ mkd_syntax.rxWikiLink1Url. mkd_syntax.rx_wikilink_md_separator.
+    \ mkd_syntax.rx_wikilink_md_suffix.
+    \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
+    \ mkd_syntax.rxWikiLink1Descr . mkd_syntax.rx_wikilink_md_separator.
+    \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
+" 2. match URL within [URL][], [DESCRIPTION][URL]
+let mkd_syntax.rxWikiLink1MatchUrl = mkd_syntax.rx_wikilink_md_prefix.
+    \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_separator.
+    \ mkd_syntax.rx_wikilink_md_suffix.
+    \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
+    \ mkd_syntax.rxWikiLink1Descr. mkd_syntax.rx_wikilink_md_separator.
+    \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_suffix
+" 3. match DESCRIPTION within [DESCRIPTION][URL]
+let mkd_syntax.rxWikiLink1MatchDescr = mkd_syntax.rx_wikilink_md_prefix.
+    \ '\zs'. mkd_syntax.rxWikiLink1Descr.'\ze'. mkd_syntax.rx_wikilink_md_separator.
+    \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
+
+let mkd_syntax.rxWikiLink1Prefix1 = mkd_syntax.rx_wikilink_md_prefix
+let mkd_syntax.rxWikiLink1Suffix1 = mkd_syntax.rx_wikilink_md_separator.
+      \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
+
+" 1. match ANY wikilink
+let mkd_syntax.rxWikiLink = ''.
+    \ mkd_syntax.rxWikiLink0.'\|'.
+    \ mkd_syntax.rxWikiLink1
+" 2. match URL within ANY wikilink
+let mkd_syntax.rxWikiLinkMatchUrl = ''.
+    \ g:vimwiki_rxWikiLink0MatchUrl.'\|'.
+    \ g:vimwiki_rxWikiLink1MatchUrl
 endfunction
 
 
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 74a00a6..debf4d4 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -88,7 +88,7 @@ endfunction "}}}
 " use max highlighting - could be quite slow if there are too many wikifiles
 if vimwiki#vars#get_wikilocal('maxhi')
   " WikiLink
-  call s:add_target_syntax_OFF(vimwiki#vars#get_global('rxWikiLink'))
+  call s:add_target_syntax_OFF(vimwiki#vars#get_syntaxlocal('rxWikiLink'))
   " WikiIncl
   call s:add_target_syntax_OFF(vimwiki#vars#get_global('rxWikiIncl'))
 
@@ -96,7 +96,7 @@ if vimwiki#vars#get_wikilocal('maxhi')
   call s:highlight_existing_links()
 else
   " Wikilink
-  call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWikiLink'), 'VimwikiLink')
+  call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWikiLink'), 'VimwikiLink')
   " WikiIncl
   call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWikiIncl'), 'VimwikiLink')
 endif
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index 1d4fde9..da6f001 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -16,108 +16,16 @@
 
 " LINKS: setup of larger regexes {{{
 
-" LINKS: setup wikilink0 regexps {{{
-" 0. [[URL]], or [[URL|DESCRIPTION]]
 
-" 0a) match [[URL|DESCRIPTION]]
-let g:vimwiki_rxWikiLink0 = g:vimwiki_rxWikiLink
-" 0b) match URL within [[URL|DESCRIPTION]]
-let g:vimwiki_rxWikiLink0MatchUrl = g:vimwiki_rxWikiLinkMatchUrl
-" 0c) match DESCRIPTION within [[URL|DESCRIPTION]]
-let g:vimwiki_rxWikiLink0MatchDescr = g:vimwiki_rxWikiLinkMatchDescr
-" }}}
 
-" LINKS: setup wikilink1 regexps {{{
-" 1. [URL][], or [DESCRIPTION][URL]
-
-let s:wikilink_md_prefix = '['
-let s:wikilink_md_suffix = ']'
-let s:wikilink_md_separator = ']['
-let s:rx_wikilink_md_prefix = vimwiki#u#escape(s:wikilink_md_prefix)
-let s:rx_wikilink_md_suffix = vimwiki#u#escape(s:wikilink_md_suffix)
-let s:rx_wikilink_md_separator = vimwiki#u#escape(s:wikilink_md_separator)
-
-" [URL][]
-let g:vimwiki_WikiLink1Template1 = s:wikilink_md_prefix . '__LinkUrl__'.
-      \ s:wikilink_md_separator. s:wikilink_md_suffix
-" [DESCRIPTION][URL]
-let g:vimwiki_WikiLink1Template2 = s:wikilink_md_prefix. '__LinkDescription__'.
-    \ s:wikilink_md_separator. '__LinkUrl__'.
-    \ s:wikilink_md_suffix
-"
-let g:vimwiki_WikiLinkMatchUrlTemplate .=
-      \ '\|' .
-      \ s:rx_wikilink_md_prefix .
-      \ '.*' .
-      \ s:rx_wikilink_md_separator .
-      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-      \ s:rx_wikilink_md_suffix .
-      \ '\|' .
-      \ s:rx_wikilink_md_prefix .
-      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-      \ s:rx_wikilink_md_separator .
-      \ s:rx_wikilink_md_suffix
-
-let s:valid_chars = '[^\\\[\]]'
-let g:vimwiki_rxWikiLink1Url = s:valid_chars.'\{-}'
-let g:vimwiki_rxWikiLink1Descr = s:valid_chars.'\{-}'
-
-let g:vimwiki_rxWikiLink1InvalidPrefix = '[\]\[]\@<!'
-let g:vimwiki_rxWikiLink1InvalidSuffix = '[\]\[]\@!'
-let s:rx_wikilink_md_prefix = g:vimwiki_rxWikiLink1InvalidPrefix.
-      \ s:rx_wikilink_md_prefix
-let s:rx_wikilink_md_suffix = s:rx_wikilink_md_suffix.
-      \ g:vimwiki_rxWikiLink1InvalidSuffix
-
-"
-" 1. [URL][], [DESCRIPTION][URL]
-" 1a) match [URL][], [DESCRIPTION][URL]
-let g:vimwiki_rxWikiLink1 = s:rx_wikilink_md_prefix.
-    \ g:vimwiki_rxWikiLink1Url. s:rx_wikilink_md_separator.
-    \ s:rx_wikilink_md_suffix.
-    \ '\|'. s:rx_wikilink_md_prefix.
-    \ g:vimwiki_rxWikiLink1Descr.s:rx_wikilink_md_separator.
-    \ g:vimwiki_rxWikiLink1Url.s:rx_wikilink_md_suffix
-" 1b) match URL within [URL][], [DESCRIPTION][URL]
-let g:vimwiki_rxWikiLink1MatchUrl = s:rx_wikilink_md_prefix.
-    \ '\zs'. g:vimwiki_rxWikiLink1Url. '\ze'. s:rx_wikilink_md_separator.
-    \ s:rx_wikilink_md_suffix.
-    \ '\|'. s:rx_wikilink_md_prefix.
-    \ g:vimwiki_rxWikiLink1Descr. s:rx_wikilink_md_separator.
-    \ '\zs'. g:vimwiki_rxWikiLink1Url. '\ze'. s:rx_wikilink_md_suffix
-" 1c) match DESCRIPTION within [DESCRIPTION][URL]
-let g:vimwiki_rxWikiLink1MatchDescr = s:rx_wikilink_md_prefix.
-    \ '\zs'. g:vimwiki_rxWikiLink1Descr.'\ze'. s:rx_wikilink_md_separator.
-    \ g:vimwiki_rxWikiLink1Url.s:rx_wikilink_md_suffix
-" }}}
-
-" LINKS: Syntax helper {{{
-let g:vimwiki_rxWikiLink1Prefix1 = s:rx_wikilink_md_prefix
-let g:vimwiki_rxWikiLink1Suffix1 = s:rx_wikilink_md_separator.
-      \ g:vimwiki_rxWikiLink1Url.s:rx_wikilink_md_suffix
-" }}}
 
 " *. ANY wikilink {{{
-" *a) match ANY wikilink
-let g:vimwiki_rxWikiLink = ''.
-    \ g:vimwiki_rxWikiLink0.'\|'.
-    \ g:vimwiki_rxWikiLink1
-" *b) match URL within ANY wikilink
-let g:vimwiki_rxWikiLinkMatchUrl = ''.
-    \ g:vimwiki_rxWikiLink0MatchUrl.'\|'.
-    \ g:vimwiki_rxWikiLink1MatchUrl
 " *c) match DESCRIPTION within ANY wikilink
 let g:vimwiki_rxWikiLinkMatchDescr = ''.
     \ g:vimwiki_rxWikiLink0MatchDescr.'\|'.
     \ g:vimwiki_rxWikiLink1MatchDescr
 " }}}
 
-" LINKS: setup of wikiincl regexps {{{
-" }}}
-
-" LINKS: Syntax helper {{{
-" }}}
-
 " LINKS: Setup weblink0 regexps {{{
 " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L)) 
 let g:vimwiki_rxWeblink0 = g:vimwiki_rxWeblink
@@ -336,12 +244,12 @@ let s:options = ' contained transparent contains=NONE'
 " conceal wikilink1
 execute 'syn match VimwikiWikiLink1Char /'.s:rx_wikilink_md_prefix.'/'.s:options
 execute 'syn match VimwikiWikiLink1Char /'.s:rx_wikilink_md_suffix.'/'.s:options
-execute 'syn match VimwikiWikiLink1Char /'.g:vimwiki_rxWikiLink1Prefix1.'/'.s:options
-execute 'syn match VimwikiWikiLink1Char /'.g:vimwiki_rxWikiLink1Suffix1.'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rxWikiLink1Prefix1').'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rxWikiLink1Suffix1').'/'.s:options
 
 " conceal weblink1
-execute 'syn match VimwikiWeblink1Char "'.g:vimwiki_rxWeblink1Prefix1.'"'.s:options
-execute 'syn match VimwikiWeblink1Char "'.g:vimwiki_rxWeblink1Suffix1.'"'.s:options
+execute 'syn match VimwikiWeblink1Char "'.vimwiki#vars#get_syntaxlocal('rxWeblink1Prefix1').'"'.s:options
+execute 'syn match VimwikiWeblink1Char "'.vimwiki#vars#get_syntaxlocal('rxWeblink1Suffix1').'"'.s:options
 
 if exists("+conceallevel")
   syntax conceal off

From ce5c82207278131b89f51326790562317522d88a Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 12 Jan 2017 21:45:09 +0100
Subject: [PATCH 018/108] Start refactoring the rest -- part 6

Ref #256
---
 autoload/vimwiki/base.vim          |  10 +-
 autoload/vimwiki/html.vim          |   8 +-
 autoload/vimwiki/markdown_base.vim |  14 +-
 autoload/vimwiki/vars.vim          | 209 +++++++++++++++++++----------
 syntax/vimwiki.vim                 |  13 +-
 syntax/vimwiki_markdown_custom.vim | 157 ++++------------------
 6 files changed, 185 insertions(+), 226 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 81c9c45..4a7abce 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1103,8 +1103,8 @@ function! vimwiki#base#follow_link(split, ...) "{{{ Parse link at cursor and pas
     endif
     " try Weblink
     if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink')),
-            \ vimwiki#vars#get_global('rxWeblinkMatchUrl'))
+      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink')),
+            \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
     endif
 
     if lnk != ""
@@ -1766,7 +1766,7 @@ function! s:normalize_link_syntax_n() " {{{
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_global('WikiLinkTemplate2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink'), sub)
     return
@@ -1780,11 +1780,11 @@ function! s:normalize_link_syntax_n() " {{{
   endif
 
   " try Weblink
-  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink'))
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
           \ lnk, '', vimwiki#vars#get_global('WikiLinkTemplate2'))
-    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_global('rxWeblink'), sub)
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink'), sub)
     return
   endif
 
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 944e857..72b946a 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -375,8 +375,8 @@ endfunction "}}}
 function! s:tag_weblink(value) "{{{
   " Weblink Template -> <a href="url">descr</a>
   let str = a:value
-  let url = matchstr(str, vimwiki#vars#get_global('rxWeblinkMatchUrl'))
-  let descr = matchstr(str, vimwiki#vars#get_global('rxWeblinkMatchDescr'))
+  let url = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
+  let descr = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWeblinkMatchDescr'))
   let line = vimwiki#html#linkify_link(url, descr)
   return line
 endfunction "}}}
@@ -425,7 +425,7 @@ function! s:tag_wikilink(value) "{{{
   " [[#a1#a2]]                -> <a href="#a1-a2">#a1#a2</a>
   let str = a:value
   let url = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
-  let descr = matchstr(str, vimwiki#vars#get_global('rxWikiLinkMatchDescr'))
+  let descr = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'))
   let descr = (substitute(descr,'^\s*\(.*\)\s*$','\1','') != '' ? descr : url)
 
   let line = VimwikiLinkConverter(url, s:current_wiki_file,
@@ -573,7 +573,7 @@ function! s:process_tags_links(line) " {{{
   let line = a:line
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxWikiLink'), 's:tag_wikilink')
   let line = s:make_tag(line, vimwiki#vars#get_global('rxWikiIncl'), 's:tag_wikiincl')
-  let line = s:make_tag(line, vimwiki#vars#get_global('rxWeblink'), 's:tag_weblink')
+  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxWeblink'), 's:tag_weblink')
   return line
 endfunction " }}}
 
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index 429e2c5..f0ee7a3 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -101,8 +101,8 @@ function! vimwiki#markdown_base#follow_link(split, ...) "{{{ Parse link at curso
     endif
     " try Weblink
     if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink')),
-            \ vimwiki#vars#get_global('rxWeblinkMatchUrl'))
+      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink')),
+            \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
     endif
 
     if lnk != ""
@@ -142,7 +142,7 @@ function! s:normalize_link_syntax_n() " {{{
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_syntaxlocal('WikiLink1Template2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'), sub)
     return
@@ -152,19 +152,19 @@ function! s:normalize_link_syntax_n() " {{{
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_global('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_global('WikiLinkTemplate2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), sub)
     return
   endif
   
   " try Weblink
-  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWeblink'))
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_global('rxWeblinkMatchUrl'), vimwiki#vars#get_global('rxWeblinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWeblinkMatchDescr'),
           \ vimwiki#vars#get_syntaxlocal('Weblink1Template'))
-    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_global('rxWeblink'), sub)
+    call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink'), sub)
     return
   endif
 
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 0d915df..9e7a1b0 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -79,7 +79,7 @@ function! s:populate_global_variables()
           \ '\%('.join(split(web_schemes2, '\s*,\s*'), '\|').'\):'.
         \ '\)'
 
-  let g:vimwiki_global_vars['rxWeblinkUrl'] = rxWebProtocols . '\S\{-1,}'. '\%(([^ \t()]*)\)\='
+  let g:vimwiki_global_vars.rxWeblinkUrl = rxWebProtocols . '\S\{-1,}'. '\%(([^ \t()]*)\)\='
 
   let wikilink_prefix = '[['
   let wikilink_suffix = ']]'
@@ -105,12 +105,6 @@ function! s:populate_global_variables()
   " non-Ascii characters
   let g:vimwiki_global_vars.rxWord = '[^[:blank:]!"$%&''()*+,:;<=>?\[\]\\^`{}]\+'
 
-  " [[URL]], or [[URL|DESCRIPTION]]
-  " c) match DESCRIPTION within [[URL|DESCRIPTION]]
-  let g:vimwiki_global_vars.rxWikiLinkMatchDescr = g:vimwiki_global_vars.rx_wikilink_prefix.
-        \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator.'\%('.
-        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkDescr. '\ze\)\?'. g:vimwiki_global_vars.rx_wikilink_suffix
-
   let g:vimwiki_global_vars.rx_wikilink_prefix1 = g:vimwiki_global_vars.rx_wikilink_prefix . g:vimwiki_global_vars.rxWikiLinkUrl .
         \ g:vimwiki_global_vars.rx_wikilink_separator
   let g:vimwiki_global_vars.rx_wikilink_suffix1 = g:vimwiki_global_vars.rx_wikilink_suffix
@@ -147,15 +141,6 @@ function! s:populate_global_variables()
   let g:vimwiki_global_vars.rxWikiInclSuffix1 = g:vimwiki_global_vars.rxWikiInclArgs.
         \ g:vimwiki_global_vars.rxWikiInclSuffix
 
-  " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
-  " let g:vimwiki_rxWeblink = '[\["(|]\@<!'. g:vimwiki_rxWeblinkUrl .
-  " \ '\%([),:;.!?]\=\%([ \t]\|$\)\)\@='
-  let g:vimwiki_global_vars.rxWeblink = '\<'. g:vimwiki_global_vars.rxWeblinkUrl . '\S*'
-  " 0a) match URL within URL
-  let g:vimwiki_global_vars.rxWeblinkMatchUrl = g:vimwiki_global_vars.rxWeblink
-  " 0b) match DESCRIPTION within URL
-  let g:vimwiki_global_vars.rxWeblinkMatchDescr = ''
-
   let g:vimwiki_global_vars.rxTodo = '\C\%(TODO:\|DONE:\|STARTED:\|FIXME:\|FIXED:\|XXX:\)'
 
   " default colors when headers of different levels are highlighted differently
@@ -348,6 +333,15 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'.g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['.g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
   endif
 
+  " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
+  " let g:vimwiki_rxWeblink = '[\["(|]\@<!'. g:vimwiki_rxWeblinkUrl .
+  " \ '\%([),:;.!?]\=\%([ \t]\|$\)\)\@='
+  let g:vimwiki_syntax_variables[a:syntax].rxWeblink = '\<'. g:vimwiki_global_vars.rxWeblinkUrl . '\S*'
+  " 0a) match URL within URL
+  let g:vimwiki_syntax_variables[a:syntax].rxWeblinkMatchUrl = g:vimwiki_syntax_variables[a:syntax].rxWeblink
+  " 0b) match DESCRIPTION within URL
+  let g:vimwiki_syntax_variables[a:syntax].rxWeblinkMatchDescr = ''
+
   " template for matching all wiki links with a given target file
   let g:vimwiki_syntax_variables[a:syntax].WikiLinkMatchUrlTemplate =
         \ g:vimwiki_global_vars.rx_wikilink_prefix .
@@ -365,11 +359,15 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
         \ g:vimwiki_global_vars.rxWikiLinkUrl.'\%('.g:vimwiki_global_vars.rx_wikilink_separator.
         \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
   let g:vimwiki_syntax_variables[a:syntax].rxAnyLink = g:vimwiki_syntax_variables[a:syntax].rxWikiLink.'\|'.
-      \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_global_vars.rxWeblink
+      \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_syntax_variables[a:syntax].rxWeblink
   " b) match URL within [[URL|DESCRIPTION]]
   let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchUrl = g:vimwiki_global_vars.rx_wikilink_prefix.
         \ '\zs'. g:vimwiki_global_vars.rxWikiLinkUrl.'\ze\%('. g:vimwiki_global_vars.rx_wikilink_separator.
         \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
+  " c) match DESCRIPTION within [[URL|DESCRIPTION]]
+  let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchDescr = g:vimwiki_global_vars.rx_wikilink_prefix.
+        \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator.'\%('.
+        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkDescr. '\ze\)\?'. g:vimwiki_global_vars.rx_wikilink_suffix
 
   if a:syntax ==# 'markdown'
     call s:populate_extra_markdown_vars()
@@ -381,11 +379,11 @@ function! s:populate_extra_markdown_vars()
   let mkd_syntax = g:vimwiki_syntax_variables['markdown']
 
   " 0a) match [[URL|DESCRIPTION]]
-  let mkd_syntax.vimwiki_rxWikiLink0 = mkd_syntax.rxWikiLink
+  let mkd_syntax.rxWikiLink0 = mkd_syntax.rxWikiLink
   " 0b) match URL within [[URL|DESCRIPTION]]
-  let mkd_syntax.vimwiki_rxWikiLink0MatchUrl = mkd_syntax.rxWikiLinkMatchUrl
+  let mkd_syntax.rxWikiLink0MatchUrl = mkd_syntax.rxWikiLinkMatchUrl
   " 0c) match DESCRIPTION within [[URL|DESCRIPTION]]
-  let mkd_syntax.vimwiki_rxWikiLink0MatchDescr = g:vimwiki_global_vars.rxWikiLinkMatchDescr
+  let mkd_syntax.rxWikiLink0MatchDescr = g:vimwiki_global_vars.rxWikiLinkMatchDescr
 
   let wikilink_md_prefix = '['
   let wikilink_md_suffix = ']'
@@ -401,59 +399,124 @@ function! s:populate_extra_markdown_vars()
   let mkd_syntax.WikiLink1Template2 = wikilink_md_prefix. '__LinkDescription__'.
         \ wikilink_md_separator. '__LinkUrl__'. wikilink_md_suffix
   let mkd_syntax.WikiLinkMatchUrlTemplate .=
-      \ '\|' .
-      \ mkd_syntax.rx_wikilink_md_prefix .
-      \ '.*' .
-      \ rx_wikilink_md_separator .
-      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-      \ mkd_syntax.rx_wikilink_md_suffix .
-      \ '\|' .
-      \ mkd_syntax.rx_wikilink_md_prefix .
-      \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
-      \ rx_wikilink_md_separator .
-      \ mkd_syntax.rx_wikilink_md_suffix
+        \ '\|' .
+        \ mkd_syntax.rx_wikilink_md_prefix .
+        \ '.*' .
+        \ rx_wikilink_md_separator .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+        \ mkd_syntax.rx_wikilink_md_suffix .
+        \ '\|' .
+        \ mkd_syntax.rx_wikilink_md_prefix .
+        \ '\zs__LinkUrl__\ze\%(#.*\)\?' .
+        \ rx_wikilink_md_separator .
+        \ mkd_syntax.rx_wikilink_md_suffix
 
-let valid_chars = '[^\\\[\]]'
-let mkd_syntax.rxWikiLink1Url = valid_chars.'\{-}'
-let mkd_syntax.rxWikiLink1Descr = valid_chars.'\{-}'
-let mkd_syntax.rxWikiLink1InvalidPrefix = '[\]\[]\@<!'
-let mkd_syntax.rxWikiLink1InvalidSuffix = '[\]\[]\@!'
-let mkd_syntax.rx_wikilink_md_prefix = mkd_syntax.rxWikiLink1InvalidPrefix.
-      \ mkd_syntax.rx_wikilink_md_prefix
-let mkd_syntax.rx_wikilink_md_suffix = mkd_syntax.rx_wikilink_md_suffix.
-      \ mkd_syntax.rxWikiLink1InvalidSuffix
+  let valid_chars = '[^\\\[\]]'
+  let mkd_syntax.rxWikiLink1Url = valid_chars.'\{-}'
+  let mkd_syntax.rxWikiLink1Descr = valid_chars.'\{-}'
+  let mkd_syntax.rxWikiLink1InvalidPrefix = '[\]\[]\@<!'
+  let mkd_syntax.rxWikiLink1InvalidSuffix = '[\]\[]\@!'
+  let mkd_syntax.rx_wikilink_md_prefix = mkd_syntax.rxWikiLink1InvalidPrefix.
+        \ mkd_syntax.rx_wikilink_md_prefix
+  let mkd_syntax.rx_wikilink_md_suffix = mkd_syntax.rx_wikilink_md_suffix.
+        \ mkd_syntax.rxWikiLink1InvalidSuffix
 
-" 1. match [URL][], [DESCRIPTION][URL]
-let mkd_syntax.rxWikiLink1 = mkd_syntax.rx_wikilink_md_prefix.
-    \ mkd_syntax.rxWikiLink1Url. mkd_syntax.rx_wikilink_md_separator.
-    \ mkd_syntax.rx_wikilink_md_suffix.
-    \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
-    \ mkd_syntax.rxWikiLink1Descr . mkd_syntax.rx_wikilink_md_separator.
-    \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
-" 2. match URL within [URL][], [DESCRIPTION][URL]
-let mkd_syntax.rxWikiLink1MatchUrl = mkd_syntax.rx_wikilink_md_prefix.
-    \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_separator.
-    \ mkd_syntax.rx_wikilink_md_suffix.
-    \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
-    \ mkd_syntax.rxWikiLink1Descr. mkd_syntax.rx_wikilink_md_separator.
-    \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_suffix
-" 3. match DESCRIPTION within [DESCRIPTION][URL]
-let mkd_syntax.rxWikiLink1MatchDescr = mkd_syntax.rx_wikilink_md_prefix.
-    \ '\zs'. mkd_syntax.rxWikiLink1Descr.'\ze'. mkd_syntax.rx_wikilink_md_separator.
-    \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
+  " 1. match [URL][], [DESCRIPTION][URL]
+  let mkd_syntax.rxWikiLink1 = mkd_syntax.rx_wikilink_md_prefix.
+        \ mkd_syntax.rxWikiLink1Url. mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rx_wikilink_md_suffix.
+        \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
+        \ mkd_syntax.rxWikiLink1Descr . mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
+  " 2. match URL within [URL][], [DESCRIPTION][URL]
+  let mkd_syntax.rxWikiLink1MatchUrl = mkd_syntax.rx_wikilink_md_prefix.
+        \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rx_wikilink_md_suffix.
+        \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
+        \ mkd_syntax.rxWikiLink1Descr. mkd_syntax.rx_wikilink_md_separator.
+        \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_suffix
+  " 3. match DESCRIPTION within [DESCRIPTION][URL]
+  let mkd_syntax.rxWikiLink1MatchDescr = mkd_syntax.rx_wikilink_md_prefix.
+        \ '\zs'. mkd_syntax.rxWikiLink1Descr.'\ze'. mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
 
-let mkd_syntax.rxWikiLink1Prefix1 = mkd_syntax.rx_wikilink_md_prefix
-let mkd_syntax.rxWikiLink1Suffix1 = mkd_syntax.rx_wikilink_md_separator.
-      \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
+  let mkd_syntax.rxWikiLink1Prefix1 = mkd_syntax.rx_wikilink_md_prefix
+  let mkd_syntax.rxWikiLink1Suffix1 = mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
 
-" 1. match ANY wikilink
-let mkd_syntax.rxWikiLink = ''.
-    \ mkd_syntax.rxWikiLink0.'\|'.
-    \ mkd_syntax.rxWikiLink1
-" 2. match URL within ANY wikilink
-let mkd_syntax.rxWikiLinkMatchUrl = ''.
-    \ g:vimwiki_rxWikiLink0MatchUrl.'\|'.
-    \ g:vimwiki_rxWikiLink1MatchUrl
+  " 1. match ANY wikilink
+  let mkd_syntax.rxWikiLink = mkd_syntax.rxWikiLink0 . '\|' . mkd_syntax.rxWikiLink1
+  " 2. match URL within ANY wikilink
+  let mkd_syntax.rxWikiLinkMatchUrl = mkd_syntax.rxWikiLink0MatchUrl . '\|' .
+        \ mkd_syntax.rxWikiLink1MatchUrl
+  " 3. match DESCRIPTION within ANY wikilink
+  let mkd_syntax.rxWikiLinkMatchDescr = mkd_syntax.rxWikiLink0MatchDescr . '\|' .
+        \ mkd_syntax.rxWikiLink1MatchDescr
+
+  " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
+  let mkd_syntax.rxWeblink0 = mkd_syntax.rxWeblink
+  " 0a) match URL within URL
+  let mkd_syntax.rxWeblinkMatchUrl0 = mkd_syntax.rxWeblinkMatchUrl
+  " 0b) match DESCRIPTION within URL
+  let mkd_syntax.rxWeblinkMatchDescr0 = mkd_syntax.rxWeblinkMatchDescr
+
+  let mkd_syntax.rxWeblink1Prefix = '['
+  let mkd_syntax.rxWeblink1Suffix = ')'
+  let mkd_syntax.rxWeblink1Separator = ']('
+  " [DESCRIPTION](URL)
+  let mkd_syntax.Weblink1Template = mkd_syntax.rxWeblink1Prefix . '__LinkDescription__'.
+        \ mkd_syntax.rxWeblink1Separator. '__LinkUrl__'.
+        \ mkd_syntax.rxWeblink1Suffix
+
+  let valid_chars = '[^\\]'
+
+  let mkd_syntax.rxWeblink1Prefix = vimwiki#u#escape(mkd_syntax.rxWeblink1Prefix)
+  let mkd_syntax.rxWeblink1Suffix = vimwiki#u#escape(mkd_syntax.rxWeblink1Suffix)
+  let mkd_syntax.rxWeblink1Separator = vimwiki#u#escape(mkd_syntax.rxWeblink1Separator)
+  let mkd_syntax.rxWeblink1Url = valid_chars.'\{-}'
+  let mkd_syntax.rxWeblink1Descr = valid_chars.'\{-}'
+
+  " 1. [DESCRIPTION](URL)
+  " 1a) match [DESCRIPTION](URL)
+  let mkd_syntax.rxWeblink1 = mkd_syntax.rxWeblink1Prefix.
+        \ mkd_syntax.rxWeblink1Url . mkd_syntax.rxWeblink1Separator.
+        \ mkd_syntax.rxWeblink1Descr . mkd_syntax.rxWeblink1Suffix
+  " 1b) match URL within [DESCRIPTION](URL)
+  let mkd_syntax.rxWeblink1MatchUrl = mkd_syntax.rxWeblink1Prefix.
+        \ mkd_syntax.rxWeblink1Descr. mkd_syntax.rxWeblink1Separator.
+        \ '\zs' . mkd_syntax.rxWeblink1Url . '\ze' . mkd_syntax.rxWeblink1Suffix
+  " 1c) match DESCRIPTION within [DESCRIPTION](URL)
+  let mkd_syntax.rxWeblink1MatchDescr = mkd_syntax.rxWeblink1Prefix.
+        \ '\zs'.mkd_syntax.rxWeblink1Descr.'\ze'. mkd_syntax.rxWeblink1Separator.
+        \ mkd_syntax.rxWeblink1Url. mkd_syntax.rxWeblink1Suffix
+
+  " TODO: image links too !!
+  let mkd_syntax.rxWeblink1Prefix1 = mkd_syntax.rxWeblink1Prefix
+  let mkd_syntax.rxWeblink1Suffix1 = mkd_syntax.rxWeblink1Separator.
+        \ mkd_syntax.rxWeblink1Url . mkd_syntax.rxWeblink1Suffix
+
+  " *a) match ANY weblink
+  let mkd_syntax.rxWeblink = ''.
+        \ mkd_syntax.rxWeblink1.'\|'.
+        \ mkd_syntax.rxWeblink0
+  " *b) match URL within ANY weblink
+  let mkd_syntax.rxWeblinkMatchUrl = ''.
+        \ mkd_syntax.rxWeblink1MatchUrl.'\|'.
+        \ mkd_syntax.rxWeblinkMatchUrl0
+  " *c) match DESCRIPTION within ANY weblink
+  let mkd_syntax.rxWeblinkMatchDescr = ''.
+        \ mkd_syntax.rxWeblink1MatchDescr.'\|'.
+        \ mkd_syntax.rxWeblinkMatchDescr0
+
+  let g:vimwiki_rxAnyLink = g:vimwiki_rxWikiLink.'\|'.
+        \ g:vimwiki_rxWikiIncl.'\|'.mkd_syntax.rxWeblink
+
+  let mkd_syntax.rxMkdRef = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)'.
+        \ mkd_syntax.rxWeblink0
+  let g:vimwiki_rxMkdRefMatchDescr = '\[\zs'.g:vimwiki_global_vars.rxWikiLinkDescr.'\ze]:\%(\s\+\|\n\)'.
+        \ mkd_syntax.rxWeblink0
+  let g:vimwiki_rxMkdRefMatchUrl = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)\zs'.
+        \ mkd_syntax.rxWeblink0.'\ze'
 endfunction
 
 
@@ -492,6 +555,14 @@ function! vimwiki#vars#get_bufferlocal(key)
     let subdir = vimwiki#vars#get_bufferlocal('subdir')
     let b:vimwiki_invsubdir = vimwiki#base#invsubdir(subdir)
     return b:vimwiki_invsubdir
+  elseif a:key ==# 'existing_wikifiles'
+    let b:vimwiki_existing_wikifiles =
+        \ vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 1)
+    return b:vimwiki_existing_wikifiles
+  elseif a:key ==# 'existing_wikidirs'
+    let b:vimwiki_existing_wikidirs =
+        \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr'))
+    return b:vimwiki_existing_wikidirs
   endif
 endfunction
 
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index debf4d4..b6f6d48 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -10,13 +10,6 @@ elseif exists("b:current_syntax")
 endif
 
 
-if vimwiki#vars#get_wikilocal('maxhi')
-  let b:existing_wikifiles =
-        \ vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 1)
-  let b:existing_wikidirs  =
-        \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr'))
-endif
-
 let s:current_syntax = vimwiki#vars#get_wikilocal('syntax')
 
 call vimwiki#vars#populate_syntax_vars(s:current_syntax)
@@ -46,10 +39,10 @@ function! s:highlight_existing_links() "{{{
   " Conditional highlighting that depends on the existence of a wiki file or
   "   directory is only available for *schemeless* wiki links
   " Links are set up upon BufEnter (see plugin/...)
-  let safe_links = '\%('.vimwiki#base#file_pattern(b:existing_wikifiles) .
+  let safe_links = '\%('.vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikifiles')) .
         \ '\%(#[^|]*\)\?\|#[^|]*\)'
   " Wikilink Dirs set up upon BufEnter (see plugin/...)
-  let safe_dirs = vimwiki#base#file_pattern(b:existing_wikidirs)
+  let safe_dirs = vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikidirs'))
 
   " match [[URL]]
   let target = vimwiki#base#apply_template(
@@ -102,7 +95,7 @@ else
 endif
 
 " Weblink
-call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWeblink'), 'VimwikiLink')
+call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWeblink'), 'VimwikiLink')
 
 " WikiLink
 " All remaining schemes are highlighted automatically
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index da6f001..7f3cc15 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -1,114 +1,9 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
-" Vimwiki syntax file
-" Desc: Special stuff for markdown syntax
-" Home: https://github.com/vimwiki/vimwiki/
-
-" LINKS: assume this is common to all syntaxes "{{{
-
-" }}}
-
-" -------------------------------------------------------------------------
-" Load concrete Wiki syntax: sets regexes and templates for headers and links
-
-" -------------------------------------------------------------------------
-
-
-
-" LINKS: setup of larger regexes {{{
 
 
 
 
-" *. ANY wikilink {{{
-" *c) match DESCRIPTION within ANY wikilink
-let g:vimwiki_rxWikiLinkMatchDescr = ''.
-    \ g:vimwiki_rxWikiLink0MatchDescr.'\|'.
-    \ g:vimwiki_rxWikiLink1MatchDescr
-" }}}
-
-" LINKS: Setup weblink0 regexps {{{
-" 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L)) 
-let g:vimwiki_rxWeblink0 = g:vimwiki_rxWeblink
-" 0a) match URL within URL
-let g:vimwiki_rxWeblinkMatchUrl0 = g:vimwiki_rxWeblinkMatchUrl
-" 0b) match DESCRIPTION within URL
-let g:vimwiki_rxWeblinkMatchDescr0 = g:vimwiki_rxWeblinkMatchDescr
-" }}}
-
-" LINKS: Setup weblink1 regexps {{{
-let g:vimwiki_rxWeblink1Prefix = '['
-let g:vimwiki_rxWeblink1Suffix = ')'
-let g:vimwiki_rxWeblink1Separator = ']('
-" [DESCRIPTION](URL)
-let g:vimwiki_Weblink1Template = g:vimwiki_rxWeblink1Prefix . '__LinkDescription__'. 
-      \ g:vimwiki_rxWeblink1Separator. '__LinkUrl__'.
-      \ g:vimwiki_rxWeblink1Suffix
-
-let s:valid_chars = '[^\\]'
-
-let g:vimwiki_rxWeblink1Prefix = vimwiki#u#escape(g:vimwiki_rxWeblink1Prefix)
-let g:vimwiki_rxWeblink1Suffix = vimwiki#u#escape(g:vimwiki_rxWeblink1Suffix)
-let g:vimwiki_rxWeblink1Separator = vimwiki#u#escape(g:vimwiki_rxWeblink1Separator)
-let g:vimwiki_rxWeblink1Url = s:valid_chars.'\{-}'
-let g:vimwiki_rxWeblink1Descr = s:valid_chars.'\{-}'
-
-"
-" " 2012-02-04 TODO not starting with [[ or ][ ?  ... prefix = '[\[\]]\@<!\[' 
-" 1. [DESCRIPTION](URL)
-" 1a) match [DESCRIPTION](URL)
-let g:vimwiki_rxWeblink1 = g:vimwiki_rxWeblink1Prefix.
-      \ g:vimwiki_rxWeblink1Url.g:vimwiki_rxWeblink1Separator.
-      \ g:vimwiki_rxWeblink1Descr.g:vimwiki_rxWeblink1Suffix
-" 1b) match URL within [DESCRIPTION](URL)
-let g:vimwiki_rxWeblink1MatchUrl = g:vimwiki_rxWeblink1Prefix.
-      \ g:vimwiki_rxWeblink1Descr. g:vimwiki_rxWeblink1Separator.
-      \ '\zs'.g:vimwiki_rxWeblink1Url.'\ze'. g:vimwiki_rxWeblink1Suffix
-" 1c) match DESCRIPTION within [DESCRIPTION](URL)
-let g:vimwiki_rxWeblink1MatchDescr = g:vimwiki_rxWeblink1Prefix.
-      \ '\zs'.g:vimwiki_rxWeblink1Descr.'\ze'. g:vimwiki_rxWeblink1Separator.
-      \ g:vimwiki_rxWeblink1Url. g:vimwiki_rxWeblink1Suffix
-" }}}
-
-" Syntax helper {{{
-" TODO: image links too !!
-" let g:vimwiki_rxWeblink1Prefix1 = '!\?'. g:vimwiki_rxWeblink1Prefix
-let g:vimwiki_rxWeblink1Prefix1 = g:vimwiki_rxWeblink1Prefix
-let g:vimwiki_rxWeblink1Suffix1 = g:vimwiki_rxWeblink1Separator.
-      \ g:vimwiki_rxWeblink1Url.g:vimwiki_rxWeblink1Suffix
-" }}}
-
-" *. ANY weblink {{{
-" *a) match ANY weblink
-let g:vimwiki_rxWeblink = ''.
-    \ g:vimwiki_rxWeblink1.'\|'.
-    \ g:vimwiki_rxWeblink0
-" *b) match URL within ANY weblink
-let g:vimwiki_rxWeblinkMatchUrl = ''.
-    \ g:vimwiki_rxWeblink1MatchUrl.'\|'.
-    \ g:vimwiki_rxWeblinkMatchUrl0
-" *c) match DESCRIPTION within ANY weblink
-let g:vimwiki_rxWeblinkMatchDescr = ''.
-    \ g:vimwiki_rxWeblink1MatchDescr.'\|'.
-    \ g:vimwiki_rxWeblinkMatchDescr0
-" }}}
 
 
-" LINKS: Setup anylink regexps {{{
-let g:vimwiki_rxAnyLink = g:vimwiki_rxWikiLink.'\|'. 
-      \ g:vimwiki_rxWikiIncl.'\|'.g:vimwiki_rxWeblink
-" }}}
-
-
-" LINKS: setup wikilink1 reference link definitions {{{
-let g:vimwiki_rxMkdRef = '\['.g:vimwiki_rxWikiLinkDescr.']:\%(\s\+\|\n\)'.
-      \ g:vimwiki_rxWeblink0
-let g:vimwiki_rxMkdRefMatchDescr = '\[\zs'.g:vimwiki_rxWikiLinkDescr.'\ze]:\%(\s\+\|\n\)'.
-      \ g:vimwiki_rxWeblink0
-let g:vimwiki_rxMkdRefMatchUrl = '\['.g:vimwiki_rxWikiLinkDescr.']:\%(\s\+\|\n\)\zs'.
-      \ g:vimwiki_rxWeblink0.'\ze'
-" }}}
-
-" }}} end of Links
 
 " LINKS: highlighting is complicated due to "nonexistent" links feature {{{
 function! s:add_target_syntax_ON(target, type) " {{{
@@ -130,8 +25,8 @@ function! s:add_target_syntax_OFF(target, type) " {{{
 endfunction "}}}
 
 function! s:wrap_wikilink1_rx(target) "{{{
-  return g:vimwiki_rxWikiLink1InvalidPrefix.a:target.
-        \ g:vimwiki_rxWikiLink1InvalidSuffix
+  return vimwiki#vars#get_syntaxlocal('rxWikiLink1InvalidPrefix') . a:target.
+        \ vimwiki#vars#get_syntaxlocal('rxWikiLink1InvalidSuffix')
 endfunction "}}}
 
 function! s:existing_mkd_refs() "{{{
@@ -144,45 +39,45 @@ function! s:highlight_existing_links() "{{{
   " Conditional highlighting that depends on the existence of a wiki file or
   "   directory is only available for *schemeless* wiki links
   " Links are set up upon BufEnter (see plugin/...)
-  let safe_links = '\%('.vimwiki#base#file_pattern(b:existing_wikifiles) .
+  let safe_links = '\%('.vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikifiles')) .
         \ '\%(#[^|]*\)\?\|#[^|]*\)'
   " Wikilink1 Dirs set up upon BufEnter (see plugin/...)
-  let safe_dirs = vimwiki#base#file_pattern(b:existing_wikidirs)
+  let safe_dirs = vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikidirs'))
   " Ref links are cached
   let safe_reflinks = vimwiki#base#file_pattern(s:existing_mkd_refs())
 
 
   " match [URL][]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLink1Template1),
-        \ safe_links, g:vimwiki_rxWikiLink1Descr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template1')),
+        \ safe_links, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
   " match [DESCRIPTION][URL]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLink1Template2),
-        \ safe_links, g:vimwiki_rxWikiLink1Descr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template2')),
+        \ safe_links, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
 
   " match [DIRURL][]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLink1Template1),
-        \ safe_dirs, g:vimwiki_rxWikiLink1Descr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template1')),
+        \ safe_dirs, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
   " match [DESCRIPTION][DIRURL]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLink1Template2),
-        \ safe_dirs, g:vimwiki_rxWikiLink1Descr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template2')),
+        \ safe_dirs, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
 
   " match [MKDREF][]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLink1Template1),
-        \ safe_reflinks, g:vimwiki_rxWikiLink1Descr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template1')),
+        \ safe_reflinks, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
   " match [DESCRIPTION][MKDREF]
   let target = vimwiki#base#apply_template(
-        \ vimwiki#u#escape(g:vimwiki_WikiLink1Template2),
-        \ safe_reflinks, g:vimwiki_rxWikiLink1Descr, '')
+        \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template2')),
+        \ safe_reflinks, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
 endfunction "}}}
 
@@ -190,17 +85,17 @@ endfunction "}}}
 " use max highlighting - could be quite slow if there are too many wikifiles
 if vimwiki#vars#get_wikilocal('maxhi')
   " WikiLink
-  call s:add_target_syntax_OFF(g:vimwiki_rxWikiLink1, 'VimwikiWikiLink1')
+  call s:add_target_syntax_OFF(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), 'VimwikiWikiLink1')
 
   " Subsequently, links verified on vimwiki's path are highlighted as existing
   call s:highlight_existing_links()
 else
   " Wikilink
-  call s:add_target_syntax_ON(g:vimwiki_rxWikiLink1, 'VimwikiWikiLink1')
+  call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), 'VimwikiWikiLink1')
 endif
 
 " Weblink
-call s:add_target_syntax_ON(g:vimwiki_rxWeblink1, 'VimwikiWeblink1')
+call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWeblink1'), 'VimwikiWeblink1')
 
 " WikiLink
 " All remaining schemes are highlighted automatically
@@ -211,13 +106,13 @@ let s:rxSchemes = '\%('.
 
 " a) match [nonwiki-scheme-URL]
 let s:target = vimwiki#base#apply_template(
-      \ vimwiki#u#escape(g:vimwiki_WikiLink1Template1),
-      \ s:rxSchemes.g:vimwiki_rxWikiLink1Url, g:vimwiki_rxWikiLink1Descr, '')
+      \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template1')),
+      \ s:rxSchemes . vimwiki#vars#get_syntaxlocal('rxWikiLink1Url'), vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
 call s:add_target_syntax_ON(s:wrap_wikilink1_rx(s:target), 'VimwikiWikiLink1')
 " b) match [DESCRIPTION][nonwiki-scheme-URL]
 let s:target = vimwiki#base#apply_template(
-      \ vimwiki#u#escape(g:vimwiki_WikiLink1Template2),
-      \ s:rxSchemes.g:vimwiki_rxWikiLink1Url, g:vimwiki_rxWikiLink1Descr, '')
+      \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template2')),
+      \ s:rxSchemes . vimwiki#vars#get_syntaxlocal('rxWikiLink1Url'), vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
 call s:add_target_syntax_ON(s:wrap_wikilink1_rx(s:target), 'VimwikiWikiLink1')
 " }}}
 
@@ -226,7 +121,7 @@ call s:add_target_syntax_ON(s:wrap_wikilink1_rx(s:target), 'VimwikiWikiLink1')
 
 " Header levels, 1-6
 for s:i in range(1,6)
-  execute 'syntax match VimwikiHeader'.s:i.' /'.g:vimwiki_rxH{s:i}.'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
+  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocalg('rxH'.s:i).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
 endfor
 
 " }}}
@@ -242,8 +137,8 @@ syntax spell toplevel
 " is present) and may be concealed
 let s:options = ' contained transparent contains=NONE'
 " conceal wikilink1
-execute 'syn match VimwikiWikiLink1Char /'.s:rx_wikilink_md_prefix.'/'.s:options
-execute 'syn match VimwikiWikiLink1Char /'.s:rx_wikilink_md_suffix.'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rx_wikilink_md_prefix').'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rx_wikilink_md_suffix').'/'.s:options
 execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rxWikiLink1Prefix1').'/'.s:options
 execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rxWikiLink1Suffix1').'/'.s:options
 

From fea76ace23c924a4a0221eb002f8a42db6aa6f7e Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 13 Jan 2017 16:33:41 +0100
Subject: [PATCH 019/108] Use new access functions for buffer-local variables

Ref #256
---
 autoload/vimwiki/base.vim | 18 +++++++++--------
 autoload/vimwiki/vars.vim | 41 ++++++++++++++++++++++-----------------
 plugin/vimwiki.vim        | 12 ++++++------
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 4a7abce..0d18377 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -722,7 +722,7 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
   " a:1 -- previous vimwiki link to save
   " a:2 -- should we update previous link
   if a:0 && a:2 && len(a:1) > 0
-    let b:vimwiki_prev_link = a:1
+    call vimwiki#vars#set_bufferlocal('prev_link', a:1)
   endif
 endfunction " }}}
 
@@ -880,8 +880,10 @@ function! s:get_wiki_buffers() "{{{
   while bcount<=bufnr("$")
     if bufexists(bcount)
       let bname = fnamemodify(bufname(bcount), ":p")
+      " this may find buffers that are not part of the current wiki, but that
+      " doesn't hurt
       if bname =~# vimwiki#vars#get_wikilocal('ext')."$"
-        let bitem = [bname, getbufvar(bname, "vimwiki_prev_link")]
+        let bitem = [bname, vimwiki#vars#get_bufferlocal('prev_link', bcount)]
         call add(blist, bitem)
       endif
     endif
@@ -894,7 +896,7 @@ endfunction " }}}
 function! s:open_wiki_buffer(item) "{{{
   call vimwiki#base#edit_file(':e', a:item[0], '')
   if !empty(a:item[1])
-    call setbufvar(a:item[0], "vimwiki_prev_link", a:item[1])
+    call vimwiki#vars#set_bufferlocal('prev_link', a:item[1], a:item[0])
   endif
 endfunction " }}}
 
@@ -1125,11 +1127,11 @@ endfunction " }}}
 
 " vimwiki#base#go_back_link
 function! vimwiki#base#go_back_link() "{{{
-  if exists("b:vimwiki_prev_link")
+  let prev_link = vimwiki#vars#get_bufferlocal('prev_link')
+  if prev_link !=# ''
     " go back to saved wiki link
-    let prev_word = b:vimwiki_prev_link
-    execute ":e ".substitute(prev_word[0], '\s', '\\\0', 'g')
-    call setpos('.', prev_word[1])
+    execute ":e ".substitute(prev_link[0], '\s', '\\\0', 'g')
+    call setpos('.', prev_link[1])
   else
     " maybe we came here by jumping to a tag -> pop from the tag stack
     silent! pop!
@@ -1251,7 +1253,7 @@ function! vimwiki#base#rename_link() "{{{
   let &buftype="nofile"
 
   let cur_buffer = [expand('%:p'),
-        \getbufvar(expand('%:p'), "vimwiki_prev_link")]
+        \ vimwiki#vars#get_bufferlocal('prev_link')]
 
   let blist = s:get_wiki_buffers()
 
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 9e7a1b0..e4a6b72 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -540,35 +540,40 @@ function! vimwiki#vars#get_syntaxlocal(key, ...)
 endfunction
 
 
-" Get a variable for the buffer we are currently in.
+" Get a variable for the buffer we are currently in or for the given buffer (number or name).
 " Populate the variable, if it doesn't exist.
-function! vimwiki#vars#get_bufferlocal(key)
-  if exists('b:vimwiki_'.a:key)
-    return b:vimwiki_{a:key}
+function! vimwiki#vars#get_bufferlocal(key, ...)
+  let buffer = a:0 ? a:1 : '%'
+
+  let value = getbufvar(buffer, 'vimwiki_'.a:key, '/\/\')
+  if type(value) != 1 || value !=# '/\/\'
+    return value
   elseif a:key ==# 'wiki_nr'
-    let b:vimwiki_wiki_nr = vimwiki#base#find_wiki(expand('%:p'))
-    return b:vimwiki_wiki_nr
+    call setbufvar(buffer, 'vimwiki_wiki_nr', vimwiki#base#find_wiki(expand('%:p')))
   elseif a:key ==# 'subdir'
-    let b:vimwiki_subdir = vimwiki#base#current_subdir()
-    return b:vimwiki_subdir
+    call setbufvar(buffer, 'vimwiki_subdir', vimwiki#base#current_subdir())
   elseif a:key ==# 'invsubdir'
     let subdir = vimwiki#vars#get_bufferlocal('subdir')
-    let b:vimwiki_invsubdir = vimwiki#base#invsubdir(subdir)
-    return b:vimwiki_invsubdir
+    call setbufvar(buffer, 'vimwiki_invsubdir', vimwiki#base#invsubdir(subdir))
   elseif a:key ==# 'existing_wikifiles'
-    let b:vimwiki_existing_wikifiles =
-        \ vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 1)
-    return b:vimwiki_existing_wikifiles
+    call setbufvar(buffer, 'vimwiki_existing_wikifiles',
+          \ vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 1))
   elseif a:key ==# 'existing_wikidirs'
-    let b:vimwiki_existing_wikidirs =
-        \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr'))
-    return b:vimwiki_existing_wikidirs
+    call setbufvar(buffer, 'vimwiki_existing_wikidirs',
+        \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr')))
+  elseif a:key ==# 'prev_link'
+    call setbufvar(buffer, 'vimwiki_prev_link', '')
+  elseif a:key ==# 'fs_rescan'
+    call setbufvar(buffer, 'vimwiki_fs_rescan', 0)
   endif
+
+  return getbufvar(buffer, 'vimwiki_'.a:key)
 endfunction
 
 
-function! vimwiki#vars#set_bufferlocal(key, value)
-  let b:vimwiki_{a:key} = a:value
+function! vimwiki#vars#set_bufferlocal(key, value, ...)
+  let buffer = a:0 ? a:1 : '%'
+  call setbufvar(buffer, 'vimwiki_' . a:key, a:value)
 endfunction
 
 
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index a703d48..13797f8 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -66,11 +66,11 @@ function! s:setup_new_wiki_buffer() "{{{
 
   " to force a rescan of the filesystem which may have changed
   " and update VimwikiLinks syntax group that depends on it;
-  " b:vimwiki_fs_rescan indicates that setup_filetype() has not been run
-  if exists('b:vimwiki_fs_rescan') && vimwiki#vars#get_wikilocal('maxhi')
+  " 'fs_rescan' indicates that setup_filetype() has not been run
+  if vimwiki#vars#get_bufferlocal('fs_rescan') == 1 && vimwiki#vars#get_wikilocal('maxhi')
     set syntax=vimwiki
   endif
-  let b:vimwiki_fs_rescan = 1
+  call vimwiki#vars#set_bufferlocal('fs_rescan', 1)
 endfunction "}}}
 
 
@@ -90,11 +90,11 @@ function! s:setup_buffer_enter() "{{{
   elseif &syntax ==? 'vimwiki'
     " to force a rescan of the filesystem which may have changed
     " and update VimwikiLinks syntax group that depends on it;
-    " b:vimwiki_fs_rescan indicates that setup_filetype() has not been run
-    if exists("b:vimwiki_fs_rescan") && vimwiki#vars#get_wikilocal('maxhi')
+    " 'fs_rescan' indicates that setup_filetype() has not been run
+    if vimwiki#vars#get_bufferlocal('fs_rescan') == 1 && vimwiki#vars#get_wikilocal('maxhi')
       set syntax=vimwiki
     endif
-    let b:vimwiki_fs_rescan = 1
+    call vimwiki#vars#set_bufferlocal('fs_rescan', 1)
   endif
 
   " The settings foldmethod, foldexpr and foldtext are local to window. Thus in

From 31760a7ef75ac704ab4dd7f666efe230ff9f567b Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Mon, 16 Jan 2017 22:09:49 +0100
Subject: [PATCH 020/108] Fix a few regression bugs

Ref #256
---
 autoload/vimwiki/base.vim          |  4 ++--
 autoload/vimwiki/html.vim          |  2 +-
 autoload/vimwiki/markdown_base.vim | 24 +-----------------------
 autoload/vimwiki/vars.vim          | 28 ++++++++++++++++------------
 syntax/vimwiki_markdown_custom.vim |  5 ++---
 5 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 0d18377..2a68ac6 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -81,7 +81,7 @@ function! vimwiki#base#find_wiki(path) "{{{
       return idx
     endif
     let idx += 1
-  endwhile
+  endfor
 
   " an orphan page has been detected
   return -1
@@ -1128,7 +1128,7 @@ endfunction " }}}
 " vimwiki#base#go_back_link
 function! vimwiki#base#go_back_link() "{{{
   let prev_link = vimwiki#vars#get_bufferlocal('prev_link')
-  if prev_link !=# ''
+  if !empty(prev_link)
     " go back to saved wiki link
     execute ":e ".substitute(prev_link[0], '\s', '\\\0', 'g')
     call setpos('.', prev_link[1])
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 72b946a..a6a1f63 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -559,7 +559,7 @@ function! s:process_tags_typefaces(line, header_ids) "{{{
   let line = a:line
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxItalic'), 's:tag_em')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxBold'), 's:tag_strong', a:header_ids)
-  let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxTodo'), 's:tag_todo')
+  let line = s:make_tag(line, vimwiki#vars#get_global('rxTodo'), 's:tag_todo')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxDelText'), 's:tag_strike')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxSuperScript'), 's:tag_super')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxSubScript'), 's:tag_sub')
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index f0ee7a3..a207f53 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -6,11 +6,6 @@
 
 " MISC helper functions {{{
 
-" vimwiki#markdown_base#reset_mkd_refs
-function! vimwiki#markdown_base#reset_mkd_refs() "{{{
-  call vimwiki#vars#set_bufferlocal('markdown_refs', {})
-endfunction "}}}
-
 " vimwiki#markdown_base#scan_reflinks
 function! vimwiki#markdown_base#scan_reflinks() " {{{
   let mkd_refs = {}
@@ -35,29 +30,12 @@ function! vimwiki#markdown_base#scan_reflinks() " {{{
 endfunction "}}}
 
 
-" vimwiki#markdown_base#get_reflinks
-function! vimwiki#markdown_base#get_reflinks() " {{{
-  let done = 1
-  try
-    let mkd_refs = vimwiki#vars#get_bufferlocal('markdown_refs')
-  catch
-    " work-around hack
-    let done = 0
-    " ... the following command does not work inside catch block !?
-    " > let mkd_refs = vimwiki#markdown_base#scan_reflinks()
-  endtry
-  if !done
-    let mkd_refs = vimwiki#markdown_base#scan_reflinks()
-  endif
-  return mkd_refs
-endfunction "}}}
-
 " vimwiki#markdown_base#open_reflink
 " try markdown reference links
 function! vimwiki#markdown_base#open_reflink(link) " {{{
   " echom "vimwiki#markdown_base#open_reflink"
   let link = a:link
-  let mkd_refs = vimwiki#markdown_base#get_reflinks()
+  let mkd_refs = vimwiki#vars#get_bufferlocal('markdown_refs')
   if has_key(mkd_refs, link)
     let url = mkd_refs[link]
     call vimwiki#base#system_open_link(url)
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index e4a6b72..c088106 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -383,7 +383,7 @@ function! s:populate_extra_markdown_vars()
   " 0b) match URL within [[URL|DESCRIPTION]]
   let mkd_syntax.rxWikiLink0MatchUrl = mkd_syntax.rxWikiLinkMatchUrl
   " 0c) match DESCRIPTION within [[URL|DESCRIPTION]]
-  let mkd_syntax.rxWikiLink0MatchDescr = g:vimwiki_global_vars.rxWikiLinkMatchDescr
+  let mkd_syntax.rxWikiLink0MatchDescr = mkd_syntax.rxWikiLinkMatchDescr
 
   let wikilink_md_prefix = '['
   let wikilink_md_suffix = ']'
@@ -423,25 +423,25 @@ function! s:populate_extra_markdown_vars()
 
   " 1. match [URL][], [DESCRIPTION][URL]
   let mkd_syntax.rxWikiLink1 = mkd_syntax.rx_wikilink_md_prefix.
-        \ mkd_syntax.rxWikiLink1Url. mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rxWikiLink1Url. rx_wikilink_md_separator.
         \ mkd_syntax.rx_wikilink_md_suffix.
         \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
-        \ mkd_syntax.rxWikiLink1Descr . mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rxWikiLink1Descr . rx_wikilink_md_separator.
         \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
   " 2. match URL within [URL][], [DESCRIPTION][URL]
   let mkd_syntax.rxWikiLink1MatchUrl = mkd_syntax.rx_wikilink_md_prefix.
-        \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_separator.
+        \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. rx_wikilink_md_separator.
         \ mkd_syntax.rx_wikilink_md_suffix.
         \ '\|'. mkd_syntax.rx_wikilink_md_prefix.
-        \ mkd_syntax.rxWikiLink1Descr. mkd_syntax.rx_wikilink_md_separator.
+        \ mkd_syntax.rxWikiLink1Descr. rx_wikilink_md_separator.
         \ '\zs'. mkd_syntax.rxWikiLink1Url. '\ze'. mkd_syntax.rx_wikilink_md_suffix
   " 3. match DESCRIPTION within [DESCRIPTION][URL]
   let mkd_syntax.rxWikiLink1MatchDescr = mkd_syntax.rx_wikilink_md_prefix.
-        \ '\zs'. mkd_syntax.rxWikiLink1Descr.'\ze'. mkd_syntax.rx_wikilink_md_separator.
+        \ '\zs'. mkd_syntax.rxWikiLink1Descr.'\ze'. rx_wikilink_md_separator.
         \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
 
   let mkd_syntax.rxWikiLink1Prefix1 = mkd_syntax.rx_wikilink_md_prefix
-  let mkd_syntax.rxWikiLink1Suffix1 = mkd_syntax.rx_wikilink_md_separator.
+  let mkd_syntax.rxWikiLink1Suffix1 = rx_wikilink_md_separator.
         \ mkd_syntax.rxWikiLink1Url . mkd_syntax.rx_wikilink_md_suffix
 
   " 1. match ANY wikilink
@@ -508,14 +508,14 @@ function! s:populate_extra_markdown_vars()
         \ mkd_syntax.rxWeblink1MatchDescr.'\|'.
         \ mkd_syntax.rxWeblinkMatchDescr0
 
-  let g:vimwiki_rxAnyLink = g:vimwiki_rxWikiLink.'\|'.
-        \ g:vimwiki_rxWikiIncl.'\|'.mkd_syntax.rxWeblink
+  let mkd_syntax.rxAnyLink = mkd_syntax.rxWikiLink.'\|'.
+        \ g:vimwiki_global_vars.rxWikiIncl.'\|'.mkd_syntax.rxWeblink
 
   let mkd_syntax.rxMkdRef = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)'.
         \ mkd_syntax.rxWeblink0
-  let g:vimwiki_rxMkdRefMatchDescr = '\[\zs'.g:vimwiki_global_vars.rxWikiLinkDescr.'\ze]:\%(\s\+\|\n\)'.
+  let mkd_syntax.rxMkdRefMatchDescr = '\[\zs'.g:vimwiki_global_vars.rxWikiLinkDescr.'\ze]:\%(\s\+\|\n\)'.
         \ mkd_syntax.rxWeblink0
-  let g:vimwiki_rxMkdRefMatchUrl = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)\zs'.
+  let mkd_syntax.rxMkdRefMatchUrl = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)\zs'.
         \ mkd_syntax.rxWeblink0.'\ze'
 endfunction
 
@@ -562,9 +562,13 @@ function! vimwiki#vars#get_bufferlocal(key, ...)
     call setbufvar(buffer, 'vimwiki_existing_wikidirs',
         \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr')))
   elseif a:key ==# 'prev_link'
-    call setbufvar(buffer, 'vimwiki_prev_link', '')
+    call setbufvar(buffer, 'vimwiki_prev_link', [])
   elseif a:key ==# 'fs_rescan'
     call setbufvar(buffer, 'vimwiki_fs_rescan', 0)
+  elseif a:key ==# 'markdown_refs'
+    call setbufvar(buffer, 'vimwiki_markdown_refs', vimwiki#markdown_base#scan_reflinks())
+  else
+    echoerr 'Vimwiki Error: unknown buffer variable ' . string(a:key)
   endif
 
   return getbufvar(buffer, 'vimwiki_'.a:key)
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index 7f3cc15..4f19b24 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -30,8 +30,7 @@ function! s:wrap_wikilink1_rx(target) "{{{
 endfunction "}}}
 
 function! s:existing_mkd_refs() "{{{
-  call vimwiki#markdown_base#reset_mkd_refs()
-  return keys(vimwiki#markdown_base#get_reflinks())
+  return keys(vimwiki#markdown_base#scan_reflinks())
 endfunction "}}}
 
 function! s:highlight_existing_links() "{{{
@@ -121,7 +120,7 @@ call s:add_target_syntax_ON(s:wrap_wikilink1_rx(s:target), 'VimwikiWikiLink1')
 
 " Header levels, 1-6
 for s:i in range(1,6)
-  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocalg('rxH'.s:i).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
+  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
 endfor
 
 " }}}

From d5ed58f763e4344067db458bb82a53ecbbae730a Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 16 Feb 2017 21:54:10 +0100
Subject: [PATCH 021/108] Fix a few regression bugs

Ref #256
Fix #301
---
 autoload/vimwiki/base.vim |  6 +++---
 autoload/vimwiki/lst.vim  | 45 +++++++++++++++++++++------------------
 autoload/vimwiki/vars.vim |  2 +-
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 2a68ac6..6a87cf4 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1747,7 +1747,7 @@ function! s:normalize_link_in_diary(lnk) " {{{
 
   if ! link_exists_in_wiki || link_exists_in_diary || link_is_date
     let str = a:lnk
-    let rxUrl = vimwiki#vars#get_syntaxlocal('rxWord')
+    let rxUrl = vimwiki#vars#get_global('rxWord')
     let rxDesc = ''
     let template = vimwiki#vars#get_global('WikiLinkTemplate1')
   else
@@ -1793,13 +1793,13 @@ function! s:normalize_link_syntax_n() " {{{
   " try Word (any characters except separators)
   " rxWord is less permissive than rxWikiLinkUrl which is used in
   " normalize_link_syntax_v
-  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWord'))
+  let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWord'))
   if !empty(lnk)
     if s:is_diary_file(expand("%:p"))
       let sub = s:normalize_link_in_diary(lnk)
     else
       let sub = vimwiki#base#normalize_link_helper(lnk,
-            \ vimwiki#vars#get_syntaxlocal('rxWord'), '',
+            \ vimwiki#vars#get_global('rxWord'), '',
             \ vimwiki#vars#get_global('WikiLinkTemplate1'))
     endif
     call vimwiki#base#replacestr_at_cursor('\V'.lnk, sub)
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index fce1596..41ef51b 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -188,10 +188,10 @@ function! s:get_level(lnum) "{{{
   if getline(a:lnum) =~# '^\s*$'
     return 0
   endif
-  if !vimwiki#vars#get_wikilocal('recurring_bullets')
+  if !vimwiki#vars#get_syntaxlocal('recurring_bullets')
     let level = indent(a:lnum)
   else
-    let level = s:string_length(matchstr(getline(a:lnum), s:rx_bullet_chars))-1
+    let level = s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal(rx_bullet_chars)))-1
     if level < 0
       let level = (indent(a:lnum) == 0) ? 0 : 9999
     endif
@@ -207,17 +207,19 @@ function! s:guess_kind_of_numbered_item(item) "{{{
   let number_chars = a:item.mrkr[:-2]
   let divisor = a:item.mrkr[-1:]
 
+  let number_kinds = vimwiki#vars#get_syntaxlocal('number_kinds')
+
   if number_chars =~# '\d\+'
     return '1'
   endif
   if number_chars =~# '\l\+'
-    if number_chars !~# '^[ivxlcdm]\+' || index(s:number_kinds, 'i') == -1
+    if number_chars !~# '^[ivxlcdm]\+' || index(number_kinds, 'i') == -1
       return 'a'
     else
 
       let item_above = s:get_prev_list_item(a:item, 0)
       if item_above.type != 0
-        if index(s:number_kinds, 'a') == -1 ||
+        if index(number_kinds, 'a') == -1 ||
               \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'i\+') ||
               \ s:increment_i(item_above.mrkr[:-2]) ==# number_chars
           return 'i'
@@ -225,7 +227,7 @@ function! s:guess_kind_of_numbered_item(item) "{{{
           return 'a'
         endif
       else
-        if number_chars =~# 'i\+' || index(s:number_kinds, 'a') == -1
+        if number_chars =~# 'i\+' || index(number_kinds, 'a') == -1
           return 'i'
         else
           return 'a'
@@ -235,13 +237,13 @@ function! s:guess_kind_of_numbered_item(item) "{{{
     endif
   endif
   if number_chars =~# '\u\+'
-    if number_chars !~# '^[IVXLCDM]\+' || index(s:number_kinds, 'I') == -1
+    if number_chars !~# '^[IVXLCDM]\+' || index(number_kinds, 'I') == -1
       return 'A'
     else
 
       let item_above = s:get_prev_list_item(a:item, 0)
       if item_above.type != 0
-        if index(s:number_kinds, 'A') == -1 ||
+        if index(number_kinds, 'A') == -1 ||
               \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'I\+') ||
               \ s:increment_I(item_above.mrkr[:-2]) ==# number_chars
           return 'I'
@@ -249,7 +251,7 @@ function! s:guess_kind_of_numbered_item(item) "{{{
           return 'A'
         endif
       else
-        if number_chars =~# 'I\+' || index(s:number_kinds, 'A') == -1
+        if number_chars =~# 'I\+' || index(number_kinds, 'A') == -1
           return 'I'
         else
           return 'A'
@@ -264,8 +266,9 @@ function! s:regexp_of_marker(item) "{{{
   if a:item.type == 1
     return vimwiki#u#escape(a:item.mrkr)
   elseif a:item.type == 2
+    let number_divisors = vimwiki#vars#get_syntaxlocal('number_divisors')
     for ki in ['d', 'u', 'l']
-      let match = matchstr(a:item.mrkr, '\'.ki.'\+['.s:number_divisors.']')
+      let match = matchstr(a:item.mrkr, '\'.ki.'\+['.number_divisors.']')
       if match != ''
         return '\'.ki.'\+'.vimwiki#u#escape(match[-1:])
       endif
@@ -922,8 +925,8 @@ endfunction "}}}
 
 function! s:decrease_level(item) "{{{
   let removed_indent = 0
-  if vimwiki#vars#get_wikilocal('recurring_bullets') && a:item.type == 1 &&
-        \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
+  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
     if s:string_length(a:item.mrkr) >= 2
       call s:substitute_string_in_line(a:item.lnum,
             \ s:first_char(a:item.mrkr), '')
@@ -944,8 +947,8 @@ endfunction "}}}
 
 function! s:increase_level(item) "{{{
   let additional_indent = 0
-  if vimwiki#vars#get_wikilocal('recurring_bullets') && a:item.type == 1 &&
-        \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
+  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
     call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:item.mrkr .
           \ s:first_char(a:item.mrkr))
     let additional_indent = 1
@@ -966,8 +969,8 @@ endfunction "}}}
 "a:indent_by can be negative
 function! s:indent_line_by(lnum, indent_by) "{{{
   let item = s:get_item(a:lnum)
-  if vimwiki#vars#get_wikilocal('recurring_bullets') && item.type == 1 &&
-        \ index(s:multiple_bullet_chars, s:first_char(item.mrkr)) > -1
+  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(item.mrkr)) > -1
     if a:indent_by > 0
       call s:substitute_string_in_line(a:lnum, item.mrkr,
             \ item.mrkr . s:first_char(item.mrkr))
@@ -1114,7 +1117,7 @@ endfunction "}}}
 function! s:set_new_mrkr(item, new_mrkr) "{{{
   if a:item.type == 0
     call s:substitute_rx_in_line(a:item.lnum, '^\s*\zs\ze', a:new_mrkr.' ')
-    if indent(a:item.lnum) == 0 && !vimwiki#vars#get_wikilocal('recurring_bullets')
+    if indent(a:item.lnum) == 0 && !vimwiki#vars#get_syntaxlocal('recurring_bullets')
       call s:set_indent(a:item.lnum, vimwiki#lst#get_list_margin())
     endif
   else
@@ -1136,7 +1139,7 @@ function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
     endif
 
     "handle markers like ***
-    if index(s:multiple_bullet_chars, s:first_char(new_mrkr)) > -1
+    if index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(new_mrkr)) > -1
       "use *** if the item above has *** too
       let item_above = s:get_prev_list_item(cur_item, 1)
       if item_above.type == 1 &&
@@ -1151,7 +1154,7 @@ function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
         else
           "if the old is ### and the new is * use ***
           if cur_item.type == 1 &&
-                \ index(s:multiple_bullet_chars,s:first_char(cur_item.mrkr))>-1
+                \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(cur_item.mrkr))>-1
             let new_mrkr = repeat(new_mrkr, s:string_length(cur_item.mrkr))
           else
             "use *** if the parent item has **
@@ -1195,7 +1198,7 @@ endfunction "}}}
 
 "sets kind of the item depending on neighbor items and the parent item
 function! s:adjust_mrkr(item) "{{{
-  if a:item.type == 0 || vimwiki#vars#get_wikilocal('recurring_bullets')
+  if a:item.type == 0 || vimwiki#vars#get_syntaxlocal('recurring_bullets')
     return
   endif
 
@@ -1207,7 +1210,7 @@ function! s:adjust_mrkr(item) "{{{
 
   "if possible, set e.g. *** if parent has ** as marker
   if neighbor_item.type == 0 && a:item.type == 1 &&
-        \ index(s:multiple_bullet_chars, s:first_char(a:item.mrkr)) > -1
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
     let parent_item = s:get_parent(a:item)
     if parent_item.type == 1 &&
           \ s:first_char(parent_item.mrkr) ==# s:first_char(a:item.mrkr)
@@ -1225,7 +1228,7 @@ function! s:clone_marker_from_to(from, to) "{{{
   if item_from.type == 0 | return | endif
   let new_mrkr = item_from.mrkr . ' '
   call s:substitute_rx_in_line(a:to, '^\s*', new_mrkr)
-  let new_indent = ( vimwiki#vars#get_wikilocal('recurring_bullets') ? 0 : indent(a:from) )
+  let new_indent = ( vimwiki#vars#get_syntaxlocal('recurring_bullets') ? 0 : indent(a:from) )
   call s:set_indent(a:to, new_indent)
   if item_from.cb != ''
     call s:create_cb(s:get_item(a:to))
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index c088106..2872796 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -285,7 +285,7 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   let g:vimwiki_syntax_variables[a:syntax].rxMathEnd = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathEnd.'\s*$'
 
   " list stuff
-  let rx_bullet_chars = '['.join(g:vimwiki_syntax_variables[a:syntax].bullet_types, '').']\+'
+  let g:vimwiki_syntax_variables[a:syntax].rx_bullet_chars = '['.join(g:vimwiki_syntax_variables[a:syntax].bullet_types, '').']\+'
 
   let g:vimwiki_syntax_variables[a:syntax].multiple_bullet_chars = g:vimwiki_syntax_variables[a:syntax].recurring_bullets ? g:vimwiki_syntax_variables[a:syntax].bullet_types : []
 

From f88877376732804ad9ed3adcccfb83302c21bd0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 15 Jul 2017 23:35:48 +0200
Subject: [PATCH 022/108] New feature reject a item form todo-list

Based on patches of davidlmontgomery.
---
 autoload/vimwiki/lst.vim    | 56 +++++++++++++++++++++++++++++++++++--
 ftplugin/vimwiki.vim        |  1 +
 plugin/vimwiki.vim          |  1 +
 syntax/vimwiki_default.vim  |  2 +-
 syntax/vimwiki_markdown.vim |  2 +-
 syntax/vimwiki_media.vim    |  2 +-
 6 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index adaee22..a94373c 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -693,6 +693,9 @@ function! s:get_rate(item) "{{{
     return -1
   endif
   let state = a:item.cb
+  if state == g:vimwiki_listsym_rejected
+    return -1
+  endif
   let n=len(g:vimwiki_listsyms_list)
   return index(g:vimwiki_listsyms_list, state) * 100/(n-1)
 endfunction "}}}
@@ -735,6 +738,8 @@ function! s:rate_to_state(rate) "{{{
     let state = g:vimwiki_listsyms_list[n-1]
   elseif a:rate == 0
     let state = g:vimwiki_listsyms_list[0]
+  elseif a:rate == -1
+    let state = g:vimwiki_listsym_rejected
   else
     let index = float2nr(ceil(a:rate/100.0*(n-2)))
     let state = g:vimwiki_listsyms_list[index]
@@ -759,8 +764,11 @@ function! s:update_state(item) "{{{
       break
     endif
     if child_item.cb != ''
-      let count_children_with_cb += 1
-      let sum_children_rate += s:get_rate(child_item)
+      let rate = s:get_rate(child_item)
+      if rate != -1
+        let count_children_with_cb += 1
+        let sum_children_rate += rate
+      endif
     endif
     let child_item = s:get_next_child_item(a:item, child_item)
   endwhile
@@ -909,6 +917,46 @@ function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
 
 endfunction "}}}
 
+"Toggles checkbox between [ ] and [-] or creates one
+"in the lines of the given range
+function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  if from_item.cb == ''
+
+    "if from_line has no CB, make a CB in every selected line
+    let parent_items_of_lines = []
+    for cur_ln in range(from_item.lnum, a:to_line)
+      let cur_item = s:get_item(cur_ln)
+      let success = s:create_cb(cur_item)
+
+      if success
+        let cur_parent_item = s:get_parent(cur_item)
+        if index(parent_items_of_lines, cur_parent_item) == -1
+          call insert(parent_items_of_lines, cur_parent_item)
+        endif
+      endif
+    endfor
+
+    for parent_item in parent_items_of_lines
+      call s:update_state(parent_item)
+    endfor
+
+  else
+
+    "if from_line has CB, toggle it and set all siblings to the same new state
+    let rate_first_line = s:get_rate(from_item)
+    let new_rate = rate_first_line == -1 ? 0 : -1
+
+    call s:change_cb(a:from_line, a:to_line, new_rate)
+
+  endif
+
+endfunction "}}}
+
 function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
   let first_item = s:get_corresponding_item(a:first_line)
   let last_item = s:get_corresponding_item(a:last_line)
@@ -1549,6 +1597,10 @@ function! vimwiki#lst#setup_marker_infos() "{{{
 
   "the user can set the listsyms as string, but vimwiki needs a list
   let g:vimwiki_listsyms_list = split(g:vimwiki_listsyms, '\zs')
+
+  if match(g:vimwiki_listsyms, g:vimwiki_listsym_rejected) != -1
+    echomsg "Warning: g:vimwiki_listsyms and g:vimwiki_listsym_rejected overlap"
+  endif
 endfunction "}}}
 
 function! vimwiki#lst#TO_list_item(inner, visual) "{{{
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index a2d6d3e..f2ad61f 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -295,6 +295,7 @@ command! -buffer -range -nargs=1 VimwikiChangeSymbolTo call vimwiki#lst#change_m
 command! -buffer -range -nargs=1 VimwikiListChangeSymbolI call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'i')
 command! -buffer -nargs=1 VimwikiChangeSymbolInListTo call vimwiki#lst#change_marker_in_list(<f-args>)
 command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
+command! -buffer -range VimwikiToggleListItemRejected call vimwiki#lst#toggle_rejected_cb(<line1>, <line2>)
 command! -buffer -range VimwikiIncrementListItem call vimwiki#lst#increment_cb(<line1>, <line2>)
 command! -buffer -range VimwikiDecrementListItem call vimwiki#lst#decrement_cb(<line1>, <line2>)
 command! -buffer -range -nargs=+ VimwikiListChangeLvl call vimwiki#lst#change_level(<line1>, <line2>, <f-args>)
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index e31c734..c7c90a4 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -373,6 +373,7 @@ call s:default('hl_cb_checked', 0)
 call s:default('list_ignore_newline', 1)
 call s:default('text_ignore_newline', 1)
 call s:default('listsyms', ' .oOX')
+call s:default('listsym_rejected', '-')
 call s:default('use_calendar', 1)
 call s:default('table_mappings', 1)
 call s:default('table_auto_fmt', 1)
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
index a90ea20..173c54a 100644
--- a/syntax/vimwiki_default.vim
+++ b/syntax/vimwiki_default.vim
@@ -79,7 +79,7 @@ let g:vimwiki_rxListDefine = '::\(\s\|$\)'
 call vimwiki#lst#setup_marker_infos()
 
 let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
+let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.g:vimwiki_listsym_rejected.']\)\]\s\)\?'
 let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
 
 " Preformatted text
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 3ae9da0..647cad9 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -76,7 +76,7 @@ let g:vimwiki_rxListDefine = '::\%(\s\|$\)'
 call vimwiki#lst#setup_marker_infos()
 
 let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
+let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.g:vimwiki_listsym_rejected.']\)\]\s\)\?'
 let g:vimwiki_rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_rxListBullet.'\|'.g:vimwiki_rxListNumber.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
 
 " Preformatted text
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index a6f8e4a..814d934 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -57,7 +57,7 @@ let g:vimwiki_rxListDefine = '^\%(;\|:\)\s'
 call vimwiki#lst#setup_marker_infos()
 
 let g:vimwiki_rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_rxListBullet.'\)\|\('.g:vimwiki_rxListNumber.'\)\)\s'
-let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.']\)\]\s\)\?'
+let g:vimwiki_rxListItem = g:vimwiki_rxListItemWithoutCB . '\+\%(\[\(['.g:vimwiki_listsyms.g:vimwiki_listsym_rejected.']\)\]\s\)\?'
 let g:vimwiki_rxListItemAndChildren = '^\('.g:vimwiki_rxListBullet.'\)\s\+\['.g:vimwiki_listsyms_list[-1].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_rxListBullet.'\).*\|^$\|\s.*\)\)*'
 
 " Preformatted text

From 6b9df766bb9c677894172539f52010dbf4f98566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 5 Aug 2017 14:50:58 +0200
Subject: [PATCH 023/108] Remove duplicated code

---
 autoload/vimwiki/lst.vim | 112 +++++++++++++++------------------------
 1 file changed, 42 insertions(+), 70 deletions(-)

diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index a94373c..f73fad3 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -843,6 +843,46 @@ function! s:change_cb(from_line, to_line, new_rate) "{{{
 
 endfunction "}}}
 
+"Toggles checkbox between two states in the lines of the given range,
+"creates chceckboxes if there aren't any.
+function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  if from_item.cb == ''
+
+    "if from_line has no CB, make a CB in every selected line
+    let parent_items_of_lines = []
+    for cur_ln in range(from_item.lnum, a:to_line)
+      let cur_item = s:get_item(cur_ln)
+      let success = s:create_cb(cur_item)
+
+      if success
+        let cur_parent_item = s:get_parent(cur_item)
+        if index(parent_items_of_lines, cur_parent_item) == -1
+          call insert(parent_items_of_lines, cur_parent_item)
+        endif
+      endif
+    endfor
+
+    for parent_item in parent_items_of_lines
+      call s:update_state(parent_item)
+    endfor
+
+  else
+
+    "if from_line has CB, toggle it and set all siblings to the same new state
+    let rate_first_line = s:get_rate(from_item)
+    let new_rate = rate_first_line == a:state1 ? a:state2 : a:state1
+
+    call s:change_cb(a:from_line, a:to_line, new_rate)
+
+  endif
+
+endfunction "}}}
+
 "Decrement checkbox between [ ] and [X]
 "in the lines of the given range
 function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
@@ -880,81 +920,13 @@ endfunction "}}}
 "Toggles checkbox between [ ] and [X] or creates one
 "in the lines of the given range
 function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  if from_item.cb == ''
-
-    "if from_line has no CB, make a CB in every selected line
-    let parent_items_of_lines = []
-    for cur_ln in range(from_item.lnum, a:to_line)
-      let cur_item = s:get_item(cur_ln)
-      let success = s:create_cb(cur_item)
-
-      if success
-        let cur_parent_item = s:get_parent(cur_item)
-        if index(parent_items_of_lines, cur_parent_item) == -1
-          call insert(parent_items_of_lines, cur_parent_item)
-        endif
-      endif
-    endfor
-
-    for parent_item in parent_items_of_lines
-      call s:update_state(parent_item)
-    endfor
-
-  else
-
-    "if from_line has CB, toggle it and set all siblings to the same new state
-    let rate_first_line = s:get_rate(from_item)
-    let new_rate = rate_first_line == 100 ? 0 : 100
-
-    call s:change_cb(a:from_line, a:to_line, new_rate)
-
-  endif
-
+  return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
 endfunction "}}}
 
 "Toggles checkbox between [ ] and [-] or creates one
 "in the lines of the given range
 function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  if from_item.cb == ''
-
-    "if from_line has no CB, make a CB in every selected line
-    let parent_items_of_lines = []
-    for cur_ln in range(from_item.lnum, a:to_line)
-      let cur_item = s:get_item(cur_ln)
-      let success = s:create_cb(cur_item)
-
-      if success
-        let cur_parent_item = s:get_parent(cur_item)
-        if index(parent_items_of_lines, cur_parent_item) == -1
-          call insert(parent_items_of_lines, cur_parent_item)
-        endif
-      endif
-    endfor
-
-    for parent_item in parent_items_of_lines
-      call s:update_state(parent_item)
-    endfor
-
-  else
-
-    "if from_line has CB, toggle it and set all siblings to the same new state
-    let rate_first_line = s:get_rate(from_item)
-    let new_rate = rate_first_line == -1 ? 0 : -1
-
-    call s:change_cb(a:from_line, a:to_line, new_rate)
-
-  endif
-
+  return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
 endfunction "}}}
 
 function! vimwiki#lst#remove_cb(first_line, last_line) "{{{

From f917b01998d59e7b168e193a9fdb9a1b7dafebc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 5 Aug 2017 00:20:37 +0200
Subject: [PATCH 024/108] Html-export: Add support of rejected Todo-listentry

---
 autoload/vimwiki/html.vim  | 2 ++
 autoload/vimwiki/style.css | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 0d52271..88f186b 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -876,6 +876,8 @@ function! s:process_tag_list(line, lists) "{{{
       let n = len(g:vimwiki_listsyms_list)
       if completion == 0
         let st_tag = '<li class="done0">'
+      elseif completion == -1 && chk[1] == g:vimwiki_listsym_rejected
+        let st_tag = '<li class="rejected">'
       elseif completion > 0 && completion < n
         let completion = float2nr(round(completion / (n-1.0) * 3.0 + 0.5 ))
         let st_tag = '<li class="done'.completion.'">'
diff --git a/autoload/vimwiki/style.css b/autoload/vimwiki/style.css
index da2518c..431d15b 100644
--- a/autoload/vimwiki/style.css
+++ b/autoload/vimwiki/style.css
@@ -27,6 +27,13 @@ del {text-decoration: line-through; color: #777777;}
 .tag {background-color: #eeeeee; font-family: monospace; padding: 2px;}
 
 /* classes for items of todo lists */
+.rejected {
+    /* list-style: none; */
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAACXBIWXMAAADFAAAAxQEdzbqoAAAAB3RJTUUH4QgEFhAtuWgv9wAAAPZQTFRFmpqam5iYnJaWnJeXnpSUn5OTopCQpoqKpouLp4iIqIiIrYCAt3V1vW1tv2xsmZmZmpeXnpKS/x4e/x8f/yAg/yIi/yQk/yUl/yYm/ygo/ykp/yws/zAw/zIy/zMz/zQ0/zU1/zY2/zw8/0BA/0ZG/0pK/1FR/1JS/1NT/1RU/1VV/1ZW/1dX/1pa/15e/19f/2Zm/2lp/21t/25u/3R0/3p6/4CA/4GB/4SE/4iI/46O/4+P/52d/6am/6ur/66u/7Oz/7S0/7e3/87O/9fX/9zc/93d/+Dg/+vr/+3t/+/v//Dw//Ly//X1//f3//n5//z8////gzaKowAAAA90Uk5T/Pz8/Pz8/Pz8/Pz8/f39ppQKWQAAAAFiS0dEEnu8bAAAAACuSURBVAhbPY9ZF4FQFEZPSKbIMmWep4gMGTKLkIv6/3/GPbfF97b3w17rA0kQOPgvAeHW6uJ6+5h7HqLdwowgOzejXRXBdx6UdSru216xuOMBHHNU0clTzeSUA6EhF8V8kqroluMiU6HKcuf4phGPr1o2q9kYZWwNq1qfRRmTaXpqsyjj17KkWCxKBUBgXWueHIyiAIg18gsse4KHkLF5IKIY10WQgv7fOy4ST34BRiopZ8WLNrgAAAAASUVORK5CYII=);
+    background-repeat: no-repeat;
+    background-position: 0 .2em;
+    padding-left: 1.5em;
+}
 .done0 {
     /* list-style: none; */
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==);

From 013603930679ec801249371e7a55db2a9abbb995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 5 Aug 2017 02:12:41 +0200
Subject: [PATCH 025/108] Documented VimwikiToggleListItemRejected

---
 doc/vimwiki.txt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index bc8db38..883c06c 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -656,6 +656,10 @@ Vimwiki file.
     Toggle checkbox of a list item on/off.
     See |vimwiki-todo-lists|.
 
+*:VimwikiToggleListItemRejected*
+    Toggle checkbox of a list item disabled/off.
+    See |vimwiki-todo-lists|.
+
 *:VimwikiListChangeLevel* CMD
     Change the nesting level, or symbol, for a single-line list item.
     CMD may be ">>" or "<<" to change the indentation of the item, or
@@ -1621,6 +1625,10 @@ Use gl<Space> (see |vimwiki_gl<Space>|) to remove a single checkbox and
 gL<Space> (see |vimwiki_gL<Space>|) to remove all checkboxes of the list the
 cursor is in.
 
+You can mark an item as rejected ("won't do") with
+|:VimwikiToggleListItemRejected.| It will not influence the status of it's
+parents.
+
 
 ==============================================================================
 9. Tables                                                     *vimwiki-tables*
@@ -2345,6 +2353,19 @@ You can set it to some more fancy symbols like this:
    let g:vimwiki_listsyms = '✗○◐●✓'
 
 
+------------------------------------------------------------------------------
+*g:vimwiki_listsym_rejected*
+
+Character that is used to show that an item of a todo list will not be done.
+Default value is '-'.
+
+The character used here may not be part of g:vimwiki_listsyms.
+
+You can set it to some more fancy symbols like this:
+>
+   let g:vimwiki_listsym_rejected = '✗'
+
+
 ------------------------------------------------------------------------------
 *g:vimwiki_use_mouse*
 

From 413b9ca04fe079a0eb3e93173755e2b020fff92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 5 Aug 2017 17:32:15 +0200
Subject: [PATCH 026/108] Add default keybinding glx for toggling disabled

---
 doc/vimwiki.txt      | 9 ++++++++-
 ftplugin/vimwiki.vim | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 883c06c..80ef89e 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -455,6 +455,13 @@ gLI                     Change the symbol of the current list to
                         To remap: >
                         noremap glo :VimwikiChangeSymbolTo I)<CR>
                         noremap glO :VimwikiChangeSymbolInListTo I)<CR>
+<
+                        *vimwiki_glx*
+glx                     Toggle checkbox of a list item disabled/off.
+                        Maps to |:VimwikiToggleListItemRejected|.
+                        See |vimwiki-todo-lists|.
+                        To remap: >
+                        :map <Leader>tx <Plug>VimwikiToggleListItemRejected
 <
                         *vimwiki_gqq*  *vimwiki_gww*
 gqq                     Format table. If you made some changes to a table
@@ -1626,7 +1633,7 @@ gL<Space> (see |vimwiki_gL<Space>|) to remove all checkboxes of the list the
 cursor is in.
 
 You can mark an item as rejected ("won't do") with
-|:VimwikiToggleListItemRejected.| It will not influence the status of it's
+|vimwiki_glx|. A rejected item will not influence the status of it's
 parents.
 
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index f2ad61f..e8a18e4 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -443,6 +443,10 @@ if !hasmapto('<Plug>VimwikiToggleListItem')
     vmap <silent><buffer> <C-@> <Plug>VimwikiToggleListItem
   endif
 endif
+if !hasmapto('<Plug>VimwikiToggleListItemRejected')
+  nmap <silent><buffer> glx <Plug>VimwikiToggleListItemRejected
+  vmap <silent><buffer> glx <Plug>VimwikiToggleListItemRejected
+endif
 nnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 vnoremap <silent><script><buffer>

From d772a14d43a2aef03787625c9bb55b133103d30c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 5 Aug 2017 22:18:56 +0200
Subject: [PATCH 027/108] Fix bug with keybinding

---
 ftplugin/vimwiki.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index e8a18e4..63ae674 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -451,6 +451,10 @@ nnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 vnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
+nnoremap <silent><script><buffer>
+      \ <Plug>VimwikiToggleListItemRejected :VimwikiToggleListItemRejected<CR>
+vnoremap <silent><script><buffer>
+      \ <Plug>VimwikiToggleListItemRejected :VimwikiToggleListItemRejected<CR>
 
 if !hasmapto('<Plug>VimwikiIncrementListItem')
   nmap <silent><buffer> gln <Plug>VimwikiIncrementListItem

From 97ae634b9fee4acf6003a2750071cbced0d9224e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 16 Sep 2017 15:36:10 +0200
Subject: [PATCH 028/108] Renamed command

Common prefix causes serious delays
---
 doc/vimwiki.txt      |  6 +++---
 ftplugin/vimwiki.vim | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 80ef89e..fe7c33b 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -458,10 +458,10 @@ gLI                     Change the symbol of the current list to
 <
                         *vimwiki_glx*
 glx                     Toggle checkbox of a list item disabled/off.
-                        Maps to |:VimwikiToggleListItemRejected|.
+                        Maps to |:VimwikiToggleRejectedListItem|.
                         See |vimwiki-todo-lists|.
                         To remap: >
-                        :map <Leader>tx <Plug>VimwikiToggleListItemRejected
+                        :map <Leader>tx <Plug>VimwikiToggleRejectedListItem
 <
                         *vimwiki_gqq*  *vimwiki_gww*
 gqq                     Format table. If you made some changes to a table
@@ -663,7 +663,7 @@ Vimwiki file.
     Toggle checkbox of a list item on/off.
     See |vimwiki-todo-lists|.
 
-*:VimwikiToggleListItemRejected*
+*:VimwikiToggleRejectedListItem*
     Toggle checkbox of a list item disabled/off.
     See |vimwiki-todo-lists|.
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 63ae674..2679079 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -295,7 +295,7 @@ command! -buffer -range -nargs=1 VimwikiChangeSymbolTo call vimwiki#lst#change_m
 command! -buffer -range -nargs=1 VimwikiListChangeSymbolI call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'i')
 command! -buffer -nargs=1 VimwikiChangeSymbolInListTo call vimwiki#lst#change_marker_in_list(<f-args>)
 command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
-command! -buffer -range VimwikiToggleListItemRejected call vimwiki#lst#toggle_rejected_cb(<line1>, <line2>)
+command! -buffer -range VimwikiToggleRejectedListItem call vimwiki#lst#toggle_rejected_cb(<line1>, <line2>)
 command! -buffer -range VimwikiIncrementListItem call vimwiki#lst#increment_cb(<line1>, <line2>)
 command! -buffer -range VimwikiDecrementListItem call vimwiki#lst#decrement_cb(<line1>, <line2>)
 command! -buffer -range -nargs=+ VimwikiListChangeLvl call vimwiki#lst#change_level(<line1>, <line2>, <f-args>)
@@ -443,18 +443,18 @@ if !hasmapto('<Plug>VimwikiToggleListItem')
     vmap <silent><buffer> <C-@> <Plug>VimwikiToggleListItem
   endif
 endif
-if !hasmapto('<Plug>VimwikiToggleListItemRejected')
-  nmap <silent><buffer> glx <Plug>VimwikiToggleListItemRejected
-  vmap <silent><buffer> glx <Plug>VimwikiToggleListItemRejected
+if !hasmapto('<Plug>VimwikiToggleRejectedListItem')
+  nmap <silent><buffer> glx <Plug>VimwikiToggleRejectedListItem
+  vmap <silent><buffer> glx <Plug>VimwikiToggleRejectedListItem
 endif
 nnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 vnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiToggleListItemRejected :VimwikiToggleListItemRejected<CR>
+      \ <Plug>VimwikiToggleRejectedListItem :VimwikiToggleRejectedListItem<CR>
 vnoremap <silent><script><buffer>
-      \ <Plug>VimwikiToggleListItemRejected :VimwikiToggleListItemRejected<CR>
+      \ <Plug>VimwikiToggleRejectedListItem :VimwikiToggleRejectedListItem<CR>
 
 if !hasmapto('<Plug>VimwikiIncrementListItem')
   nmap <silent><buffer> gln <Plug>VimwikiIncrementListItem

From 41e653718e29933dd9559e546b859158cc87804a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 16 Sep 2017 16:30:22 +0200
Subject: [PATCH 029/108] Allow to specify additional chars for lists

---
 autoload/vimwiki/html.vim |  6 +++++-
 autoload/vimwiki/lst.vim  | 14 +++++++++-----
 doc/vimwiki.txt           |  4 ++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 0d52271..2d04ae9 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1455,7 +1455,11 @@ function! s:convert_file(path_html, wikifile) "{{{
     endif
 
     " prepare regexps for lists
-    let s:bullets = '[*-]'
+    if exists("g:vimwiki_additional_bullet_types")
+      let s:bullets = '[*-'. join(keys(g:vimwiki_additional_bullet_types), '') . ']'
+    else
+      let s:bullets = '[*-]'
+    endif
     let s:numbers =
       \'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'
 
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index adaee22..bfe5df0 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1509,11 +1509,15 @@ endfunction "}}}
 
 "misc stuff {{{
 function! vimwiki#lst#setup_marker_infos() "{{{
-  let s:rx_bullet_chars = '['.join(keys(g:vimwiki_bullet_types), '').']\+'
+  let l:bullet_types=g:vimwiki_bullet_types
+  if exists("g:vimwiki_additional_bullet_types")
+    call extend(l:bullet_types, g:vimwiki_additional_bullet_types)
+  endif
+  let s:rx_bullet_chars = '['.join(keys(l:bullet_types), '').']\+'
 
   let s:multiple_bullet_chars = []
-  for i in keys(g:vimwiki_bullet_types)
-    if g:vimwiki_bullet_types[i] == 1
+  for i in keys(l:bullet_types)
+    if l:bullet_types[i] == 1
       call add(s:multiple_bullet_chars, i)
     endif
   endfor
@@ -1529,8 +1533,8 @@ function! vimwiki#lst#setup_marker_infos() "{{{
         \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
 
   "create regexp for bulleted list items
-  let g:vimwiki_rxListBullet = join( map(keys(g:vimwiki_bullet_types),
-        \'vimwiki#u#escape(v:val).repeat("\\+", g:vimwiki_bullet_types[v:val])'
+  let g:vimwiki_rxListBullet = join( map(keys(l:bullet_types),
+        \'vimwiki#u#escape(v:val).repeat("\\+", l:bullet_types[v:val])'
         \ ) , '\|')
 
   "create regex for numbered list items
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index bc8db38..fc4fe94 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -1552,6 +1552,10 @@ after a list using letters or vice versa, Vimwiki will get confused because
 it cannot distinguish which is which (at least if the types are both upper
 case or both lower case).
 
+You can add additional list-types in your vimrc by setting the variable 
+  let g:vimwiki_additional_bullet_types = { "→": 0}
+Corresponding mapings will not be set.
+
 See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
 |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI|
 

From 3cbc505fba895493d3f763f3d996a069766b3023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Tue, 24 Oct 2017 14:35:40 +0200
Subject: [PATCH 030/108] Update Documentation to reflect EOL of MathJax CDN

---
 doc/vimwiki.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index bc8db38..6b89238 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -1233,14 +1233,9 @@ LaTeX code).
 Note: the highlighting in Vim is automatic. For the rendering in HTML, you
 have two alternative options:
 
-1. using the MathJax server for rendering (needs internet connection).
-Add to your HTML template the following line:
-
-<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-
-2. installing MathJax locally (faster, no internet required). Choose a
-folder on your hard drive and save MathJax in it. Then add to your HTML
-template the following line:
+1. installing MathJax locally (Recommended: faster, no internet required).
+Choose a folder on your hard drive and save MathJax in it. Then add to your
+HTML template the following line:
 
 <script type="text/javascript" src="<mathjax_folder>/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 
@@ -1255,6 +1250,11 @@ template folder. For instance, a sensible folder structure could be:
 
 In this case, <mathjax_folder> would be "../mathjax" (without quotes).
 
+2. Loading MathJax from a CDN-server (needs internet connection).
+Add to your HTML template the following line:
+
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/config/TeX-AMS-MML_HTMLorMML.js"></script>
+
 
 ------------------------------------------------------------------------------
 5.9. Blockquotes                                  *vimwiki-syntax-blockquotes*

From 37e4dfc2883c0dec5862df128e7f421e0795ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sun, 17 Sep 2017 01:10:14 +0100
Subject: [PATCH 031/108] Add License-File

Vimwiki currently has not License-File, and the license is only mentioned in the help-file. We should change this.
---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..be93eec
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2008-2010 Maxim Kim
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 742fc996928e6aa2f2053848aa151fdcccd0dfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 25 Oct 2017 02:11:01 +0200
Subject: [PATCH 032/108] Add Copyright-attribution to Daniel Schemala

---
 LICENSE         | 1 +
 doc/vimwiki.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/LICENSE b/LICENSE
index be93eec..cdf8546 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2008-2010 Maxim Kim
+              2013-2017 Daniel Schemala
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 6b89238..c5b227b 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -3105,6 +3105,7 @@ The MIT Licence
 http://www.opensource.org/licenses/mit-license.php
 
 Copyright (c) 2008-2010 Maxim Kim
+              2013-2017 Daniel Schemala
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From ec3d554c0b824f0e10f455b17645d6a722520c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 25 Oct 2017 13:10:23 +0200
Subject: [PATCH 033/108] Update list of contributers

---
 doc/vimwiki.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index c5b227b..06f95b8 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -2854,6 +2854,19 @@ Contributors and their Github usernames in roughly chronological order:
     - @wangzq
     - Jinzhou Zhang (@lotabout)
     - Michael Riley (@optik-aper)
+    - Irfan Sharif (@irfansharif)
+    - John Conroy (@jconroy77)
+    - Christian Rondeau (@christianrondeau)
+    - Alex Thorne (@thornecc)
+    - Shafqat Bhuiyan (@priomsrb)
+    - Bradley Cicenas (@bcicen)
+    - Michael Thessel (@MichaelThessel)
+    - Michael F. Schönitzer (@nudin)
+    - @sqlwwx
+    - Guilherme Salazar (@salazar)
+    - Daniel Trnka (@trnila)
+    - Yuchen Pei (@ycpei)
+    - @maqiv
 
 
 ==============================================================================

From cf8e3e731929b872d154d631d5b067e4c100cc84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 25 Oct 2017 13:45:00 +0200
Subject: [PATCH 034/108] Unified spelling Licence -> License

---
 doc/vimwiki.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 06f95b8..323ccfe 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -3114,7 +3114,7 @@ http://code.google.com/p/vimwiki/issues/list
 ==============================================================================
 16. License                                                  *vimwiki-license*
 
-The MIT Licence
+The MIT License
 http://www.opensource.org/licenses/mit-license.php
 
 Copyright (c) 2008-2010 Maxim Kim

From d9a73b71173b418bc1ae64217aa4e2c65272541f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= <dpc@dpc.pw>
Date: Sat, 14 Oct 2017 23:12:47 -0700
Subject: [PATCH 035/108] Fix diary index generation with custom file
 extensions

Fix #302
---
 autoload/vimwiki/diary.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index fcd176a..d6cd9e9 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -65,7 +65,7 @@ fun! s:read_captions(files) "{{{
   let result = {}
   for fl in a:files
     " remove paths and extensions
-    let fl_key = fnamemodify(fl, ':t:r')
+    let fl_key = substitute(fnamemodify(fl, ':t'), VimwikiGet('ext').'$', '', '')
 
     if filereadable(fl)
       for line in readfile(fl, '', s:vimwiki_max_scan_for_caption)

From eed4ceff1af6ae11f33ee589f7bf099fdc62fdd5 Mon Sep 17 00:00:00 2001
From: Drew Hays <me@andrewhays.net>
Date: Thu, 17 Aug 2017 23:53:40 -0700
Subject: [PATCH 036/108] Escape the 'dot' in extension substitution

This escapes the `.` preceding an extension (e.g. `.wiki`) so that it doesn't accidentally match any character.

For example: `[vimwiki](vimwiki)` was opening the `vi.wiki` page, because of this rule.
---
 autoload/vimwiki/base.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 0cd537a..4e3cde5 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1273,7 +1273,7 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
 
       " remove the extension from the filename if exists, because non-vimwiki
       " markdown files usually include the extension in links
-      let lnk = substitute(lnk, VimwikiGet('ext').'$', '', '')
+      let lnk = substitute(lnk, '\'.VimwikiGet('ext').'$', '', '')
     endif
 
     let current_tab_page = tabpagenr()

From 293e1f51eecfe93b9e519a5b10e059edf835ac35 Mon Sep 17 00:00:00 2001
From: Daniel <danetrata@gmail.com>
Date: Sun, 18 Dec 2016 13:02:51 -0600
Subject: [PATCH 037/108] Added the option to open vimwiki in a pane.

1       tabedit
2       split
3       vsplit

Similar to opening a tab,::

vimwiki#base#goto_index(v:count1, 1)

we can now open a split with::

vimwiki#base#goto_index(v:count1, 2)

and a vertical split with::

vimwiki#base#goto_index(v:count1, 3)
---
 autoload/vimwiki/base.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 4e3cde5..a246081 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1325,8 +1325,12 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
     let idx = 0
   endif
 
-  if a:0
+  if a:0 == 1
     let cmd = 'tabedit'
+  elseif a:0 == 2
+    let cmd = 'sp'
+  elseif a:0 == 3
+    let cmd = 'vsp'
   else
     let cmd = 'edit'
   endif

From 734d0143675e64966881ee62f89391d3c2b4c06d Mon Sep 17 00:00:00 2001
From: Daniel <danetrata@gmail.com>
Date: Sun, 18 Dec 2016 13:02:51 -0600
Subject: [PATCH 038/108] Added the option to open vimwiki in a pane.

1       tabedit
2       split
3       vsplit

Similar to opening a tab,::

vimwiki#base#goto_index(1, 1)

we can now open a split with::

vimwiki#base#goto_index(1, 2)

and a vertical split with::

vimwiki#base#goto_index(1, 3)
---
 autoload/vimwiki/base.vim | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index a246081..07e3e72 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1325,16 +1325,18 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
     let idx = 0
   endif
 
-  if a:0 == 1
+  if a:1 == 1
     let cmd = 'tabedit'
-  elseif a:0 == 2
-    let cmd = 'sp'
-  elseif a:0 == 3
-    let cmd = 'vsp'
+  elseif a:1 == 2
+    let cmd = 'split'
+  elseif a:1 == 3
+    let cmd = 'vsplit'
   else
     let cmd = 'edit'
   endif
 
+  echomsg 'Passed argument '.a:0.'. Using cmd '.cmd
+
   call Validate_wiki_options(idx)
   call vimwiki#base#edit_file(cmd,
         \ VimwikiGet('path', idx).VimwikiGet('index', idx).

From 95d4c095d0a615c9586df49d3bc0eedec8e4ea4d Mon Sep 17 00:00:00 2001
From: Daniel <danetrata@gmail.com>
Date: Sun, 18 Dec 2016 13:02:51 -0600
Subject: [PATCH 039/108] Added the option to open vimwiki in a pane.

1       tabedit
2       split
3       vsplit

Similar to opening a tab,::

vimwiki#base#goto_index(v:count1, 1)

we can now open a split with::

vimwiki#base#goto_index(v:count1, 2)

and a vertical split with::

vimwiki#base#goto_index(v:count1, 3)
---
 autoload/vimwiki/base.vim | 2 --
 1 file changed, 2 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 07e3e72..ecc322b 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1335,8 +1335,6 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
     let cmd = 'edit'
   endif
 
-  echomsg 'Passed argument '.a:0.'. Using cmd '.cmd
-
   call Validate_wiki_options(idx)
   call vimwiki#base#edit_file(cmd,
         \ VimwikiGet('path', idx).VimwikiGet('index', idx).

From 02e32489d7652189026c1d4b48bf88b6da98a739 Mon Sep 17 00:00:00 2001
From: Daniel <danetrata@gmail.com>
Date: Sun, 18 Dec 2016 13:02:51 -0600
Subject: [PATCH 040/108] Added the option to open vimwiki in a pane.

1       tabedit
2       split
3       vsplit

Similar to opening a tab,::

vimwiki#base#goto_index(v:count1, 1)

we can now open a split with::

vimwiki#base#goto_index(v:count1, 2)

and a vertical split with::

vimwiki#base#goto_index(v:count1, 3)
---
 autoload/vimwiki/base.vim | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index ecc322b..6f81453 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1325,12 +1325,14 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
     let idx = 0
   endif
 
-  if a:1 == 1
-    let cmd = 'tabedit'
-  elseif a:1 == 2
-    let cmd = 'split'
-  elseif a:1 == 3
-    let cmd = 'vsplit'
+  if a:0
+    if a:1 == 1
+      let cmd = 'tabedit'
+    elseif a:1 == 2
+      let cmd = 'split'
+    elseif a:1 == 3
+      let cmd = 'vsplit'
+    endif
   else
     let cmd = 'edit'
   endif

From b6d47e894d78bc9589a11cde501093fa04da1941 Mon Sep 17 00:00:00 2001
From: Daniel Etrata <detrata@Daniels-MacBook-Pro.local>
Date: Mon, 6 Nov 2017 21:08:52 -0600
Subject: [PATCH 041/108] Give vimwiki#diary#make_note similar functionality

---
 autoload/vimwiki/diary.vim | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index d6cd9e9..2bc702b 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -174,8 +174,14 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
 
   call vimwiki#path#mkdir(VimwikiGet('path', idx).VimwikiGet('diary_rel_path', idx))
 
-  if a:0 && a:1 == 1
-    let cmd = 'tabedit'
+  if a:0
+    if a:1 == 1
+      let cmd = 'tabedit'
+    elseif a:2 == 2
+      let cmd = 'split'
+    elseif a:3 == 3
+      let cmd = 'vsplit'
+    endif
   else
     let cmd = 'edit'
   endif

From 91c382a034062e23571058f6b4cc9976016906af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Fri, 10 Nov 2017 22:28:33 +0100
Subject: [PATCH 042/108] Use a safe substitution-function everywhere

---
 autoload/vimwiki/base.vim          | 47 +++++++++++++++++-------------
 autoload/vimwiki/markdown_base.vim | 11 +++++--
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 6f81453..62140ab 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -8,6 +8,13 @@ if exists("g:loaded_vimwiki_auto") || &cp
 endif
 let g:loaded_vimwiki_auto = 1
 
+" s:safesubstitute
+function! s:safesubstitute(text, search, replace, mode) "{{{
+  " Substitute regexp but do not interpret replace
+  let escaped = escape(a:replace, '\&')
+  return substitute(a:text, a:search, escaped, a:mode)
+endfunction " }}}
+
 " s:vimwiki_get_known_syntaxes
 function! s:vimwiki_get_known_syntaxes() " {{{
   " Getting all syntaxes that different wikis could have
@@ -465,7 +472,7 @@ function! vimwiki#base#generate_links() "{{{
     let abs_filepath = vimwiki#path#abs_path_of_link(link)
     if !s:is_diary_file(abs_filepath)
       call add(lines, bullet.
-            \ substitute(g:vimwiki_WikiLinkTemplate1, '__LinkUrl__', '\='."'".link."'", ''))
+            \ s:safesubstitute(g:vimwiki_WikiLinkTemplate1, '__LinkUrl__', link, ''))
     endif
   endfor
 
@@ -677,13 +684,13 @@ function! s:jump_to_anchor(anchor) "{{{
   let segments = split(anchor, '#', 0)
   for segment in segments
 
-    let anchor_header = substitute(
+    let anchor_header = s:safesubstitute(
           \ g:vimwiki_{VimwikiGet('syntax')}_header_match,
-          \ '__Header__', "\\='".segment."'", '')
-    let anchor_bold = substitute(g:vimwiki_{VimwikiGet('syntax')}_bold_match,
-          \ '__Text__', "\\='".segment."'", '')
-    let anchor_tag = substitute(g:vimwiki_{VimwikiGet('syntax')}_tag_match,
-          \ '__Tag__', "\\='".segment."'", '')
+          \ '__Header__', segment, '')
+    let anchor_bold = s:safesubstitute(g:vimwiki_{VimwikiGet('syntax')}_bold_match,
+          \ '__Text__', segment, '')
+    let anchor_tag = s:safesubstitute(g:vimwiki_{VimwikiGet('syntax')}_tag_match,
+          \ '__Tag__', segment, '')
 
     if         !search(anchor_tag, 'Wc')
           \ && !search(anchor_header, 'Wc')
@@ -1176,8 +1183,8 @@ function! vimwiki#base#update_listing_in_buffer(strings, start_header,
 
   " write new listing
   let new_header = whitespaces_in_first_line
-        \ . substitute(g:vimwiki_rxH1_Template,
-        \ '__Header__', '\='."'".a:start_header."'", '')
+        \ . s:safesubstitute(g:vimwiki_rxH1_Template,
+        \ '__Header__', a:start_header, '')
   call append(start_lnum - 1, new_header)
   let start_lnum += 1
   let lines_diff += 1 + len(a:strings)
@@ -1832,9 +1839,9 @@ function! vimwiki#base#table_of_contents(create)
   for [lvl, link, desc] in headers
     let esc_link = substitute(link, "'", "''", 'g')
     let esc_desc = substitute(desc, "'", "''", 'g')
-    let link = substitute(g:vimwiki_WikiLinkTemplate2, '__LinkUrl__',
-          \ '\='."'".'#'.esc_link."'", '')
-    let link = substitute(link, '__LinkDescription__', '\='."'".esc_desc."'", '')
+    let link = s:safesubstitute(g:vimwiki_WikiLinkTemplate2, '__LinkUrl__',
+          \ '#'.esc_link, '')
+    let link = s:safesubstitute(link, '__LinkDescription__', esc_desc, '')
     call add(lines, startindent.repeat(indentstring, lvl-1).bullet.link)
   endfor
 
@@ -1855,13 +1862,13 @@ endfunction
 function! vimwiki#base#apply_template(template, rxUrl, rxDesc, rxStyle) "{{{
   let lnk = a:template
   if a:rxUrl != ""
-    let lnk = substitute(lnk, '__LinkUrl__', '\='."'".a:rxUrl."'", 'g')
+    let lnk = s:safesubstitute(lnk, '__LinkUrl__', a:rxUrl, 'g')
   endif
   if a:rxDesc != ""
-    let lnk = substitute(lnk, '__LinkDescription__', '\='."'".a:rxDesc."'", 'g')
+    let lnk = s:safesubstitute(lnk, '__LinkDescription__', a:rxDesc, 'g')
   endif
   if a:rxStyle != ""
-    let lnk = substitute(lnk, '__LinkStyle__', '\='."'".a:rxStyle."'", 'g')
+    let lnk = s:safesubstitute(lnk, '__LinkStyle__', a:rxStyle, 'g')
   endif
   return lnk
 endfunction " }}}
@@ -1900,8 +1907,8 @@ function! vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template) " {{{
   if descr == ""
     let descr = s:clean_url(url)
   endif
-  let lnk = substitute(template, '__LinkDescription__', '\="'.descr.'"', '')
-  let lnk = substitute(lnk, '__LinkUrl__', '\="'.url.'"', '')
+  let lnk = s:safesubstitute(template, '__LinkDescription__', descr, '')
+  let lnk = s:safesubstitute(lnk, '__LinkUrl__', url, '')
   return lnk
 endfunction " }}}
 
@@ -1909,7 +1916,7 @@ endfunction " }}}
 function! vimwiki#base#normalize_imagelink_helper(str, rxUrl, rxDesc, rxStyle, template) "{{{
   let lnk = vimwiki#base#normalize_link_helper(a:str, a:rxUrl, a:rxDesc, a:template)
   let style = matchstr(a:str, a:rxStyle)
-  let lnk = substitute(lnk, '__LinkStyle__', '\="'.style.'"', '')
+  let lnk = s:safesubstitute(lnk, '__LinkStyle__', style, '')
   return lnk
 endfunction " }}}
 
@@ -2001,8 +2008,8 @@ function! s:normalize_link_syntax_v() " {{{
     if s:is_diary_file(expand("%:p"))
       let sub = s:normalize_link_in_diary(@")
     else
-      let sub = substitute(g:vimwiki_WikiLinkTemplate1,
-            \ '__LinkUrl__', '\=' . "'" . @" . "'", '')
+      let sub = s:safesubstitute(g:vimwiki_WikiLinkTemplate1,
+            \ '__LinkUrl__', @", '')
     endif
 
     " Put substitution in register " and change text
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index 06477d8..01f2c96 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -6,6 +6,13 @@
 
 " MISC helper functions {{{
 
+" s:safesubstitute
+function! s:safesubstitute(text, search, replace, mode) "{{{
+  " Substitute regexp but do not interpret replace
+  let escaped = escape(a:replace, '\&')
+  return substitute(a:text, a:search, escaped, a:mode)
+endfunction " }}}
+
 " vimwiki#markdown_base#reset_mkd_refs
 function! vimwiki#markdown_base#reset_mkd_refs() "{{{
   call VimwikiClear('markdown_refs')
@@ -139,8 +146,8 @@ function! s:normalize_link_syntax_v() " {{{
   try
     norm! gvy
     let visual_selection = @"
-    let link = substitute(g:vimwiki_Weblink1Template, '__LinkUrl__', '\='."'".visual_selection."'", '')
-    let link = substitute(link, '__LinkDescription__', '\='."'".visual_selection."'", '')
+    let link = Safesubstitute(g:vimwiki_Weblink1Template, '__LinkUrl__', visual_selection, '')
+    let link = Safesubstitute(link, '__LinkDescription__', visual_selection, '')
 
     call setreg('"', link, 'v')
 

From 074d8827620c0d1d0535f21808862659c611ceb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sat, 4 Nov 2017 03:26:33 +0100
Subject: [PATCH 043/108] Allow Backtick in Link

---
 autoload/vimwiki/base.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 6f81453..9fdfaf5 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -840,7 +840,7 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
   " then
   " [[test*file]]...
   " you'll have E77: Too many file names
-  let fname = escape(a:filename, '% *|#')
+  let fname = escape(a:filename, '% *|#`')
   let dir = fnamemodify(a:filename, ":p:h")
 
   let ok = vimwiki#path#mkdir(dir, 1)

From 4e16db926f86ebcd068bd3b2c65ba36ff1fed463 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 11 Nov 2017 21:52:07 +0100
Subject: [PATCH 044/108] Fix more regression bugs

---
 autoload/vimwiki/base.vim |  8 ++++++--
 autoload/vimwiki/vars.vim | 13 ++++++++-----
 ftplugin/vimwiki.vim      |  3 ++-
 plugin/vimwiki.vim        |  7 ++++---
 syntax/vimwiki.vim        |  4 +++-
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 6a87cf4..4bc45af 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -378,7 +378,7 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
   " if current wiki is temporary -- was added by an arbitrary wiki file then do
   " not search wiki files in subdirectories. Or it would hang the system if
   " wiki file was created in $HOME or C:/ dirs.
-  if vimwiki#vars#get_wikilocal('temp', wiki_nr)
+  if vimwiki#vars#get_wikilocal('is_temporary_wiki', wiki_nr)
     let pattern = '*'.ext
   else
     let pattern = '**/*'.ext
@@ -707,11 +707,15 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
   " getpos() directly after this command. Strange.
   if !(a:command ==# ':e ' && vimwiki#path#is_equal(a:filename, expand('%:p')))
     execute a:command.' '.fname
+
+    " If the opened file was not already loaded by Vim, an autocommand is
+    " triggered at this point
+
     " Make sure no other plugin takes ownership over the new file. Vimwiki
     " rules them all! Well, except for directories, which may be opened with
     " Netrw
     if &filetype != 'vimwiki' && fname !~ '\m/$'
-      set filetype=vimwiki
+      setfiletype vimwiki
     endif
   endif
   if a:anchor != ''
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 2872796..93e77ba 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -192,6 +192,7 @@ function! s:populate_wikilocal_options()
 
   let g:vimwiki_wikilocal_vars = []
 
+  " set the wiki-local variables according to g:vimwiki_list (or the default settings)
   if exists('g:vimwiki_list')
     for users_options in g:vimwiki_list
       let new_wiki_settings = {}
@@ -205,8 +206,7 @@ function! s:populate_wikilocal_options()
         endif
       endfor
 
-      " is it a temporary wiki? No, it's not.
-      let new_wiki_settings.temp = 0
+      let new_wiki_settings.is_temporary_wiki = 0
 
       call add(g:vimwiki_wikilocal_vars, new_wiki_settings)
     endfor
@@ -221,7 +221,7 @@ function! s:populate_wikilocal_options()
       let temporary_options_dict[key] = default_values[key]
     endif
   endfor
-  let temporary_options_dict.temp = 1
+  let temporary_options_dict.is_temporary_wiki = 1
   call add(g:vimwiki_wikilocal_vars, temporary_options_dict)
 
   call s:validate_settings()
@@ -250,10 +250,13 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   if !exists('g:vimwiki_syntax_variables')
     let g:vimwiki_syntax_variables = {}
   endif
-  if !has_key(g:vimwiki_syntax_variables, a:syntax)
-    let g:vimwiki_syntax_variables[a:syntax] = {}
+
+  if has_key(g:vimwiki_syntax_variables, a:syntax)
+    return
   endif
 
+  let g:vimwiki_syntax_variables[a:syntax] = {}
+
   execute 'runtime! syntax/vimwiki_'.a:syntax.'.vim'
 
   " generic stuff
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index e5763f3..af6758b 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -13,7 +13,8 @@ let b:did_ftplugin = 1  " Don't load another plugin for this buffer
 let b:undo_ftplugin = "setlocal ".
       \ "suffixesadd< isfname< formatlistpat< ".
       \ "formatoptions< foldtext< ".
-      \ "foldmethod< foldexpr< commentstring< "
+      \ "foldmethod< foldexpr< commentstring< tags< omnifunc< autoindent< ".
+      \ "smartindent< cindent< comments< formatoptions<"
 " UNDO }}}
 
 " MISC STUFF {{{
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 13797f8..0c25daf 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -61,8 +61,9 @@ function! s:setup_new_wiki_buffer() "{{{
     endif
   endif
 
-  " this makes that ftplugin/vimwiki.vim is sourced
-  set filetype=vimwiki
+  " this makes that ftplugin/vimwiki.vim and afterwards syntax/vimwiki.vim are
+  " sourced
+  setfiletype vimwiki
 
   " to force a rescan of the filesystem which may have changed
   " and update VimwikiLinks syntax group that depends on it;
@@ -86,7 +87,7 @@ function! s:setup_buffer_enter() "{{{
   let &autowriteall = vimwiki#vars#get_global('autowriteall')
 
   if &filetype == ''
-    set filetype=vimwiki
+    setfiletype vimwiki
   elseif &syntax ==? 'vimwiki'
     " to force a rescan of the filesystem which may have changed
     " and update VimwikiLinks syntax group that depends on it;
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index b6f6d48..0981aee 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -311,7 +311,9 @@ if vimwiki#vars#get_global('hl_headers') == 0
   endfor
 else
   for s:i in range(1,6)
-    execute 'hi def VimwikiHeader'.s:i.' guibg=bg guifg='.vimwiki#vars#get_global('hcolor_guifg_'.&bg)[s:i-1].' gui=bold ctermfg='.vimwiki#vars#get_global('ctermfg_'.&bg)[s:i-1].' term=bold cterm=bold'
+    execute 'hi def VimwikiHeader'.s:i.' guibg=bg guifg='
+          \ .vimwiki#vars#get_global('hcolor_guifg_'.&bg)[s:i-1].' gui=bold ctermfg='
+          \ .vimwiki#vars#get_global('hcolor_ctermfg_'.&bg)[s:i-1].' term=bold cterm=bold'
   endfor
 endif
 "}}}

From c94af4b3f17711b068fa67814bcdeeda5a785181 Mon Sep 17 00:00:00 2001
From: Keith Haber <kjhaber@gmail.com>
Date: Tue, 14 Nov 2017 22:57:52 -0800
Subject: [PATCH 045/108] Update argument handling in diary#make_note

Fix an "Undefined variable: a:3" error that occurs when attempting to open
a diary page with Calendar.vim.
---
 autoload/vimwiki/diary.vim | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 2bc702b..109ae07 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -174,16 +174,15 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
 
   call vimwiki#path#mkdir(VimwikiGet('path', idx).VimwikiGet('diary_rel_path', idx))
 
+  let cmd = 'edit'
   if a:0
     if a:1 == 1
       let cmd = 'tabedit'
-    elseif a:2 == 2
+    elseif a:1 == 2
       let cmd = 'split'
-    elseif a:3 == 3
+    elseif a:1 == 3
       let cmd = 'vsplit'
     endif
-  else
-    let cmd = 'edit'
   endif
   if a:0>1
     let link = 'diary:'.a:2

From 75fe1d4f003f77a33955f436e023a4ce9548cb69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Mon, 4 Dec 2017 16:24:51 +0100
Subject: [PATCH 046/108] Fix bug: unknown function SafeSubstitute

---
 autoload/vimwiki/markdown_base.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index 01f2c96..41664e3 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -146,8 +146,8 @@ function! s:normalize_link_syntax_v() " {{{
   try
     norm! gvy
     let visual_selection = @"
-    let link = Safesubstitute(g:vimwiki_Weblink1Template, '__LinkUrl__', visual_selection, '')
-    let link = Safesubstitute(link, '__LinkDescription__', visual_selection, '')
+    let link = s:safesubstitute(g:vimwiki_Weblink1Template, '__LinkUrl__', visual_selection, '')
+    let link = s:safesubstitute(link, '__LinkDescription__', visual_selection, '')
 
     call setreg('"', link, 'v')
 

From 68ad4675a3f740f9ad116308a4230775b14ddf35 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 10 Feb 2018 21:41:07 +0100
Subject: [PATCH 047/108] Remove b:undo_ftplugin to speed up buffer loading

If this variable is present, then for some reason the complete ftplugin
file is sourced everytime a Vimwiki buffer is entered, even if the
buffer has been entered before, i.e. the guard b:did_ftplugin has no
effect. (See /usr/share/vimXX/ftplugin.vim)
Deleting these lines. I don't think undoing the settings is a common use
case, anyway.
---
 ftplugin/vimwiki.vim | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index af6758b..b75ea1f 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -8,15 +8,6 @@ endif
 let b:did_ftplugin = 1  " Don't load another plugin for this buffer
 
 
-" UNDO list {{{
-" Reset the following options to undo this plugin.
-let b:undo_ftplugin = "setlocal ".
-      \ "suffixesadd< isfname< formatlistpat< ".
-      \ "formatoptions< foldtext< ".
-      \ "foldmethod< foldexpr< commentstring< tags< omnifunc< autoindent< ".
-      \ "smartindent< cindent< comments< formatoptions<"
-" UNDO }}}
-
 " MISC STUFF {{{
 
 setlocal commentstring=%%%s

From 967b342b23f421d4d467b647d605f2c1577d4d04 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 10 Feb 2018 22:04:37 +0100
Subject: [PATCH 048/108] Formatting

---
 plugin/vimwiki.vim |  5 ++++-
 syntax/vimwiki.vim | 17 ++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 0c25daf..c48a9aa 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -83,6 +83,9 @@ function! s:setup_buffer_enter() "{{{
     return
   endif
 
+  " 'autowriteall' is a global Vim option, so in order to change it only for
+  " Vimwiki buffers, we need to set it here (when the cursor enters the buffer)
+  " and reset it when the cursor leaves the buffer
   let s:vimwiki_autowriteall_saved = &autowriteall
   let &autowriteall = vimwiki#vars#get_global('autowriteall')
 
@@ -166,7 +169,7 @@ endfunction " }}}
 
 
 " Initialization of Vimwiki starts here. Make sure everything below does not
-" cause autoload/base to be loaded
+" cause autoload/vimwiki/base.vim to be loaded
 
 call vimwiki#vars#init()
 
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 0981aee..44c07fe 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -3,7 +3,7 @@
 " Home: https://github.com/vimwiki/vimwiki/
 
 " Quit if syntax file is already loaded
-if version < 600
+if v:version < 600
   syntax clear
 elseif exists("b:current_syntax")
   finish
@@ -132,10 +132,12 @@ call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 
 " Header levels, 1-6
 for s:i in range(1,6)
-  
-  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i, s:current_syntax).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
-  execute 'syntax region VimwikiH'.s:i.'Folding start=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_Start', s:current_syntax).
-        \ '/ end=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_End', s:current_syntax).'/me=s-1 transparent fold'
+  execute 'syntax match VimwikiHeader'.s:i
+      \ . ' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i, s:current_syntax).'/'
+      \ . ' contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
+  execute 'syntax region VimwikiH'.s:i.'Folding'
+        \ . ' start=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_Start', s:current_syntax).'/'
+        \ . ' end=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_End', s:current_syntax).'/me=s-1 transparent fold'
 endfor
 
 
@@ -233,8 +235,9 @@ execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListDefine'
 execute 'syntax match VimwikiListTodo /'.vimwiki#vars#get_syntaxlocal('rxListItem').'/'
 
 if vimwiki#vars#get_global('hl_cb_checked') == 1
-  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[4].'\]\s.*$/ '.
-        \ 'contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+  execute 'syntax match VimwikiCheckBoxDone '
+        \ . ' /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[4].'\]\s.*$/'
+        \ . ' contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 elseif vimwiki#vars#get_global('hl_cb_checked') == 2
   execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemAndChildren').'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 endif

From f48dce6f1d57246e05f0fc548a977e8136eb4ab4 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 14 Feb 2018 06:53:46 +0100
Subject: [PATCH 049/108] Refactor then updating of the known wiki pages

for the 'maxhi' option.
---
 autoload/vimwiki/vars.vim |  2 --
 plugin/vimwiki.vim        | 21 ++++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 93e77ba..ca45020 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -566,8 +566,6 @@ function! vimwiki#vars#get_bufferlocal(key, ...)
         \ vimwiki#base#get_wiki_directories(vimwiki#vars#get_bufferlocal('wiki_nr')))
   elseif a:key ==# 'prev_link'
     call setbufvar(buffer, 'vimwiki_prev_link', [])
-  elseif a:key ==# 'fs_rescan'
-    call setbufvar(buffer, 'vimwiki_fs_rescan', 0)
   elseif a:key ==# 'markdown_refs'
     call setbufvar(buffer, 'vimwiki_markdown_refs', vimwiki#markdown_base#scan_reflinks())
   else
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index c48a9aa..8f7fa87 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -61,17 +61,16 @@ function! s:setup_new_wiki_buffer() "{{{
     endif
   endif
 
+  if vimwiki#vars#get_wikilocal('maxhi')
+    call vimwiki#vars#set_bufferlocal('existing_wikifiles', vimwiki#base#get_wikilinks(wiki_nr, 1))
+    call vimwiki#vars#set_bufferlocal('existing_wikidirs',
+          \ vimwiki#base#get_wiki_directories(wiki_nr))
+  endif
+
   " this makes that ftplugin/vimwiki.vim and afterwards syntax/vimwiki.vim are
   " sourced
   setfiletype vimwiki
 
-  " to force a rescan of the filesystem which may have changed
-  " and update VimwikiLinks syntax group that depends on it;
-  " 'fs_rescan' indicates that setup_filetype() has not been run
-  if vimwiki#vars#get_bufferlocal('fs_rescan') == 1 && vimwiki#vars#get_wikilocal('maxhi')
-    set syntax=vimwiki
-  endif
-  call vimwiki#vars#set_bufferlocal('fs_rescan', 1)
 endfunction "}}}
 
 
@@ -91,14 +90,6 @@ function! s:setup_buffer_enter() "{{{
 
   if &filetype == ''
     setfiletype vimwiki
-  elseif &syntax ==? 'vimwiki'
-    " to force a rescan of the filesystem which may have changed
-    " and update VimwikiLinks syntax group that depends on it;
-    " 'fs_rescan' indicates that setup_filetype() has not been run
-    if vimwiki#vars#get_bufferlocal('fs_rescan') == 1 && vimwiki#vars#get_wikilocal('maxhi')
-      set syntax=vimwiki
-    endif
-    call vimwiki#vars#set_bufferlocal('fs_rescan', 1)
   endif
 
   " The settings foldmethod, foldexpr and foldtext are local to window. Thus in

From 5419fad3f75f57c47a34671b0f1f03db8d79de03 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 15 Feb 2018 18:38:39 +0100
Subject: [PATCH 050/108] Formatting and small refactorings

---
 autoload/vimwiki/vars.vim | 214 +++++++++++++++++++++++++-------------
 doc/vimwiki.txt           |  12 +--
 ftplugin/vimwiki.vim      |  15 ++-
 plugin/vimwiki.vim        |  97 +++++++++--------
 4 files changed, 208 insertions(+), 130 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index ca45020..36fb9f5 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -1,12 +1,31 @@
 " vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: stuff concerning Vimwiki's state
 " Home: https://github.com/vimwiki/vimwiki/
 
+" ------------------------------------------------------------------------------------------------
+" This file provides functions to manage the various state variables which are needed during a
+" Vimwiki session.
+" They consist of:
+"
+" - global variables. These are stored in the dict g:vimwiki_global_vars. They consist mainly of
+"   global user variables and syntax stuff which is the same for every syntax.
+"
+" - wiki-local variables. They are stored in g:vimwiki_wikilocal_vars which is a list of
+"   dictionaries. One dict for every registered wiki. The last dictionary contains default values
+"   (used for temporary wikis).
+"
+" - syntax variables. Stored in the dict g:vimwiki_syntax_variables which holds all the regexes and
+"   other stuff which is needed for highlighting.
+"
+" - buffer-local variables. They are stored as buffer variables directly (b:foo)
+
+" As a developer, you should, if possible, only use the get_ and set_ functions for these types of
+" variables, not the underlying dicts!
+" ------------------------------------------------------------------------------------------------
+
 
-" copy the user's settings from variables of the form g:vimwiki_<option> into g:vimwiki_global_vars
-" (or set a default value)
 function! s:populate_global_variables()
+
   let g:vimwiki_global_vars = {
         \ 'CJK_length': 0,
         \ 'auto_chdir': 0,
@@ -42,37 +61,39 @@ function! s:populate_global_variables()
         \ 'w32_dir_enc': '',
         \ }
 
+  " copy the user's settings from variables of the form g:vimwiki_<option> into the dict
+  " g:vimwiki_global_vars (or set a default value)
   for key in keys(g:vimwiki_global_vars)
     if exists('g:vimwiki_'.key)
       let g:vimwiki_global_vars[key] = g:vimwiki_{key}
     endif
   endfor
 
-  " non-configurable global variables
+  " non-configurable global variables:
 
-  " Scheme regexes should be defined even if syntax file is not loaded yet cause users should be
+  " Scheme regexes must be defined even if syntax file is not loaded yet cause users should be
   " able to <leader>w<leader>w without opening any vimwiki file first
-  let g:vimwiki_global_vars['schemes'] = 'wiki\d\+,diary,local'
-  let g:vimwiki_global_vars['web_schemes1'] = 'http,https,file,ftp,gopher,telnet,nntp,ldap,rsync'.
+  let g:vimwiki_global_vars.schemes = 'wiki\d\+,diary,local'
+  let g:vimwiki_global_vars.web_schemes1 = 'http,https,file,ftp,gopher,telnet,nntp,ldap,rsync'.
         \ ',imap,pop,irc,ircs,cvs,svn,svn+ssh,git,ssh,fish,sftp'
   let web_schemes2 = 'mailto,news,xmpp,sip,sips,doi,urn,tel'
 
   let rx_schemes = '\%('.
-        \ join(split(g:vimwiki_global_vars['schemes'], '\s*,\s*'), '\|').'\|'.
-        \ join(split(g:vimwiki_global_vars['web_schemes1'], '\s*,\s*'), '\|').'\|'.
+        \ join(split(g:vimwiki_global_vars.schemes, '\s*,\s*'), '\|').'\|'.
+        \ join(split(g:vimwiki_global_vars.web_schemes1, '\s*,\s*'), '\|').'\|'.
         \ join(split(web_schemes2, '\s*,\s*'), '\|').
         \ '\)'
 
-  let g:vimwiki_global_vars['rxSchemeUrl'] = rx_schemes.':.*'
-  let g:vimwiki_global_vars['rxSchemeUrlMatchScheme'] = '\zs'.rx_schemes.'\ze:.*'
-  let g:vimwiki_global_vars['rxSchemeUrlMatchUrl'] = rx_schemes.':\zs.*\ze'
+  let g:vimwiki_global_vars.rxSchemeUrl = rx_schemes.':.*'
+  let g:vimwiki_global_vars.rxSchemeUrlMatchScheme = '\zs'.rx_schemes.'\ze:.*'
+  let g:vimwiki_global_vars.rxSchemeUrlMatchUrl = rx_schemes.':\zs.*\ze'
 
   " match URL for common protocols; see http://en.wikipedia.org/wiki/URI_scheme
   " http://tools.ietf.org/html/rfc3986
   let rxWebProtocols =
         \ '\%('.
           \ '\%('.
-            \ '\%('.join(split(g:vimwiki_global_vars['web_schemes1'], '\s*,\s*'), '\|').'\):'.
+            \ '\%('.join(split(g:vimwiki_global_vars.web_schemes1, '\s*,\s*'), '\|').'\):'.
             \ '\%(//\)'.
           \ '\)'.
         \ '\|'.
@@ -105,20 +126,20 @@ function! s:populate_global_variables()
   " non-Ascii characters
   let g:vimwiki_global_vars.rxWord = '[^[:blank:]!"$%&''()*+,:;<=>?\[\]\\^`{}]\+'
 
-  let g:vimwiki_global_vars.rx_wikilink_prefix1 = g:vimwiki_global_vars.rx_wikilink_prefix . g:vimwiki_global_vars.rxWikiLinkUrl .
-        \ g:vimwiki_global_vars.rx_wikilink_separator
+  let g:vimwiki_global_vars.rx_wikilink_prefix1 = g:vimwiki_global_vars.rx_wikilink_prefix .
+        \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator
   let g:vimwiki_global_vars.rx_wikilink_suffix1 = g:vimwiki_global_vars.rx_wikilink_suffix
 
   let g:vimwiki_global_vars.rxWikiInclPrefix = '{{'
   let g:vimwiki_global_vars.rxWikiInclSuffix = '}}'
   let g:vimwiki_global_vars.rxWikiInclSeparator = '|'
   " '{{__LinkUrl__}}'
-  let g:vimwiki_global_vars.WikiInclTemplate1 = g:vimwiki_global_vars.rxWikiInclPrefix . '__LinkUrl__'.
-        \ g:vimwiki_global_vars.rxWikiInclSuffix
+  let g:vimwiki_global_vars.WikiInclTemplate1 = g:vimwiki_global_vars.rxWikiInclPrefix
+        \ .'__LinkUrl__'. g:vimwiki_global_vars.rxWikiInclSuffix
   " '{{__LinkUrl____LinkDescription__}}'
-  let g:vimwiki_global_vars.WikiInclTemplate2 = g:vimwiki_global_vars.rxWikiInclPrefix . '__LinkUrl__'.
-        \ '__LinkDescription__'.
-        \ g:vimwiki_global_vars.rxWikiInclSuffix
+  let g:vimwiki_global_vars.WikiInclTemplate2 = g:vimwiki_global_vars.rxWikiInclPrefix
+        \ . '__LinkUrl__' . g:vimwiki_global_vars.rxWikiInclSeparator . '__LinkDescription__'
+        \ . g:vimwiki_global_vars.rxWikiInclSuffix
 
   let valid_chars = '[^\\\}]'
   let g:vimwiki_global_vars.rxWikiInclUrl = valid_chars.'\{-}'
@@ -145,26 +166,17 @@ function! s:populate_global_variables()
 
   " default colors when headers of different levels are highlighted differently
   " not making it yet another option; needed by ColorScheme autocommand
-  let g:vimwiki_global_vars.hcolor_guifg_light = ['#aa5858', '#507030', '#1030a0', '#103040', '#505050', '#636363']
-  let g:vimwiki_global_vars.hcolor_ctermfg_light = ['DarkRed', 'DarkGreen', 'DarkBlue', 'Black', 'Black', 'Black']
-  let g:vimwiki_global_vars.hcolor_guifg_dark = ['#e08090', '#80e090', '#6090e0', '#c0c0f0', '#e0e0f0', '#f0f0f0']
-  let g:vimwiki_global_vars.hcolor_ctermfg_dark = ['Red', 'Green', 'Blue', 'White', 'White', 'White']
+  let g:vimwiki_global_vars.hcolor_guifg_light = ['#aa5858', '#507030', '#1030a0', '#103040'
+        \ , '#505050', '#636363']
+  let g:vimwiki_global_vars.hcolor_ctermfg_light = ['DarkRed', 'DarkGreen', 'DarkBlue', 'Black'
+        \ , 'Black', 'Black']
+  let g:vimwiki_global_vars.hcolor_guifg_dark = ['#e08090', '#80e090', '#6090e0', '#c0c0f0'
+        \ , '#e0e0f0', '#f0f0f0']
+  let g:vimwiki_global_vars.hcolor_ctermfg_dark = ['Red', 'Green', 'Blue', 'White', 'White'
+        \ , 'White']
 endfunction
 
 
-function! s:normalize_path(path) "{{{
-  " trim trailing / and \ because otherwise resolve() doesn't work quite right
-  let path = substitute(a:path, '[/\\]\+$', '', '')
-  if path !~# '^scp:'
-    return resolve(expand(path)).'/'
-  else
-    return path.'/'
-  endif
-endfunction "}}}
-
-
-" g:vimwiki_wikilocal_vars is a list of dictionaries. One dict for every registered wiki. The last
-" dictionary contains default values (used for temporary wikis)
 function! s:populate_wikilocal_options()
   let default_values = {
         \ 'auto_export': 0,
@@ -246,6 +258,17 @@ function! s:validate_settings()
 endfunction
 
 
+function! s:normalize_path(path) "{{{
+  " trim trailing / and \ because otherwise resolve() doesn't work quite right
+  let path = substitute(a:path, '[/\\]\+$', '', '')
+  if path !~# '^scp:'
+    return resolve(expand(path)).'/'
+  else
+    return path.'/'
+  endif
+endfunction "}}}
+
+
 function! vimwiki#vars#populate_syntax_vars(syntax)
   if !exists('g:vimwiki_syntax_variables')
     let g:vimwiki_syntax_variables = {}
@@ -264,33 +287,53 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   if g:vimwiki_syntax_variables[a:syntax].symH
     " symmetric headers
     for i in range(1,6)
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Template'] = repeat(header_symbol, i).' __Header__ '.repeat(header_symbol, i)
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Start'] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{'.i.'}\s*$'
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_End'] = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'.header_symbol.'\{1,'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Template'] =
+            \ repeat(header_symbol, i).' __Header__ '.repeat(header_symbol, i)
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i] =
+            \ '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'
+            \ .header_symbol.'\{'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Start'] =
+            \ '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'
+            \ .header_symbol.'\{'.i.'}\s*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_End'] =
+            \ '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*[^'.header_symbol.']'
+            \ .header_symbol.'\{1,'.i.'}\s*$'
     endfor
-    let g:vimwiki_syntax_variables[a:syntax].rxHeader = '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*[^'.header_symbol.']\ze\1\s*$'
+    let g:vimwiki_syntax_variables[a:syntax].rxHeader =
+          \ '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*[^'.header_symbol.']\ze\1\s*$'
   else
     " asymmetric
     for i in range(1,6)
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Template'] = repeat(header_symbol, i).' __Header__'
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Start'] = '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
-      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_End'] = '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Template'] =
+            \ repeat(header_symbol, i).' __Header__'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i] =
+            \ '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_Start'] =
+            \ '^\s*'.header_symbol.'\{'.i.'}[^'.header_symbol.'].*$'
+      let g:vimwiki_syntax_variables[a:syntax]['rxH'.i.'_End'] =
+            \ '^\s*'.header_symbol.'\{1,'.i.'}[^'.header_symbol.'].*$'
     endfor
-    let g:vimwiki_syntax_variables[a:syntax].rxHeader = '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*\ze$'
+    let g:vimwiki_syntax_variables[a:syntax].rxHeader =
+          \ '^\s*\('.header_symbol.'\{1,6}\)\zs[^'.header_symbol.'].*\ze$'
   endif
 
-  let g:vimwiki_syntax_variables[a:syntax].rxPreStart = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreStart
-  let g:vimwiki_syntax_variables[a:syntax].rxPreEnd = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreEnd.'\s*$'
+  let g:vimwiki_syntax_variables[a:syntax].rxPreStart =
+        \ '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreStart
+  let g:vimwiki_syntax_variables[a:syntax].rxPreEnd =
+        \ '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxPreEnd.'\s*$'
 
-  let g:vimwiki_syntax_variables[a:syntax].rxMathStart = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathStart
-  let g:vimwiki_syntax_variables[a:syntax].rxMathEnd = '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathEnd.'\s*$'
+  let g:vimwiki_syntax_variables[a:syntax].rxMathStart =
+        \ '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathStart
+  let g:vimwiki_syntax_variables[a:syntax].rxMathEnd =
+        \ '^\s*'.g:vimwiki_syntax_variables[a:syntax].rxMathEnd.'\s*$'
 
   " list stuff
-  let g:vimwiki_syntax_variables[a:syntax].rx_bullet_chars = '['.join(g:vimwiki_syntax_variables[a:syntax].bullet_types, '').']\+'
+  let g:vimwiki_syntax_variables[a:syntax].rx_bullet_chars =
+        \ '['.join(g:vimwiki_syntax_variables[a:syntax].bullet_types, '').']\+'
 
-  let g:vimwiki_syntax_variables[a:syntax].multiple_bullet_chars = g:vimwiki_syntax_variables[a:syntax].recurring_bullets ? g:vimwiki_syntax_variables[a:syntax].bullet_types : []
+  let g:vimwiki_syntax_variables[a:syntax].multiple_bullet_chars =
+        \ g:vimwiki_syntax_variables[a:syntax].recurring_bullets
+        \ ? g:vimwiki_syntax_variables[a:syntax].bullet_types : []
 
   let g:vimwiki_syntax_variables[a:syntax].number_kinds = []
   let g:vimwiki_syntax_variables[a:syntax].number_divisors = ''
@@ -304,9 +347,11 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
 
   "create regexp for bulleted list items
   if !empty(g:vimwiki_syntax_variables[a:syntax].bullet_types)
-    let g:vimwiki_syntax_variables[a:syntax].rxListBullet = join( map(g:vimwiki_syntax_variables[a:syntax].bullet_types,
-        \'vimwiki#u#escape(v:val).repeat("\\+", g:vimwiki_syntax_variables[a:syntax].recurring_bullets)'
-        \ ) , '\|')
+    let g:vimwiki_syntax_variables[a:syntax].rxListBullet =
+          \ join( map(g:vimwiki_syntax_variables[a:syntax].bullet_types,
+          \'vimwiki#u#escape(v:val).'
+          \ .'repeat("\\+", g:vimwiki_syntax_variables[a:syntax].recurring_bullets)'
+          \ ) , '\|')
   else
     "regex that matches nothing
     let g:vimwiki_syntax_variables[a:syntax].rxListBullet = '$^'
@@ -319,7 +364,8 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
       let g:vimwiki_syntax_variables[a:syntax].rxListNumber .= char_to_rx[type[0]] .
             \ vimwiki#u#escape(type[1]) . '\|'
     endfor
-    let g:vimwiki_syntax_variables[a:syntax].rxListNumber .= char_to_rx[g:vimwiki_syntax_variables[a:syntax].number_types[-1][0]].
+    let g:vimwiki_syntax_variables[a:syntax].rxListNumber .=
+          \ char_to_rx[g:vimwiki_syntax_variables[a:syntax].number_types[-1][0]].
           \ vimwiki#u#escape(g:vimwiki_syntax_variables[a:syntax].number_types[-1][1]) . '\)'
   else
     "regex that matches nothing
@@ -327,21 +373,34 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   endif
 
   "the user can set the listsyms as string, but vimwiki needs a list
-  let g:vimwiki_syntax_variables[a:syntax].listsyms_list = split(vimwiki#vars#get_global('listsyms'), '\zs')
-  let g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB = '^\s*\%(\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\|\('.g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\)\s'
-  let g:vimwiki_syntax_variables[a:syntax].rxListItem = g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
+  let g:vimwiki_syntax_variables[a:syntax].listsyms_list =
+        \ split(vimwiki#vars#get_global('listsyms'), '\zs')
+  let g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB =
+        \ '^\s*\%(\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\|\('
+        \ .g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\)\s'
+  let g:vimwiki_syntax_variables[a:syntax].rxListItem =
+        \ g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB
+        \ . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
   if g:vimwiki_syntax_variables[a:syntax].recurring_bullets
-    let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\['.g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\).*\|^$\|\s.*\)\)*'
+    let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
+          \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\['
+          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\%('
+          \ .g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\).*\|^$\|\s.*\)\)*'
   else
-    let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren = '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'.g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['.g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
+    let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
+          \ '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'
+          \ . g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['
+          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
   endif
 
   " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
   " let g:vimwiki_rxWeblink = '[\["(|]\@<!'. g:vimwiki_rxWeblinkUrl .
   " \ '\%([),:;.!?]\=\%([ \t]\|$\)\)\@='
-  let g:vimwiki_syntax_variables[a:syntax].rxWeblink = '\<'. g:vimwiki_global_vars.rxWeblinkUrl . '\S*'
+  let g:vimwiki_syntax_variables[a:syntax].rxWeblink =
+        \ '\<'. g:vimwiki_global_vars.rxWeblinkUrl . '\S*'
   " 0a) match URL within URL
-  let g:vimwiki_syntax_variables[a:syntax].rxWeblinkMatchUrl = g:vimwiki_syntax_variables[a:syntax].rxWeblink
+  let g:vimwiki_syntax_variables[a:syntax].rxWeblinkMatchUrl =
+        \ g:vimwiki_syntax_variables[a:syntax].rxWeblink
   " 0b) match DESCRIPTION within URL
   let g:vimwiki_syntax_variables[a:syntax].rxWeblinkMatchDescr = ''
 
@@ -361,16 +420,20 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   let g:vimwiki_syntax_variables[a:syntax].rxWikiLink = g:vimwiki_global_vars.rx_wikilink_prefix.
         \ g:vimwiki_global_vars.rxWikiLinkUrl.'\%('.g:vimwiki_global_vars.rx_wikilink_separator.
         \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
-  let g:vimwiki_syntax_variables[a:syntax].rxAnyLink = g:vimwiki_syntax_variables[a:syntax].rxWikiLink.'\|'.
-      \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_syntax_variables[a:syntax].rxWeblink
+  let g:vimwiki_syntax_variables[a:syntax].rxAnyLink =
+        \ g:vimwiki_syntax_variables[a:syntax].rxWikiLink.'\|'.
+        \ g:vimwiki_global_vars.rxWikiIncl.'\|'.g:vimwiki_syntax_variables[a:syntax].rxWeblink
   " b) match URL within [[URL|DESCRIPTION]]
-  let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchUrl = g:vimwiki_global_vars.rx_wikilink_prefix.
-        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkUrl.'\ze\%('. g:vimwiki_global_vars.rx_wikilink_separator.
-        \ g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
+  let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchUrl =
+        \ g:vimwiki_global_vars.rx_wikilink_prefix . '\zs'. g:vimwiki_global_vars.rxWikiLinkUrl
+        \ .'\ze\%('. g:vimwiki_global_vars.rx_wikilink_separator
+        \ . g:vimwiki_global_vars.rxWikiLinkDescr.'\)\?'.g:vimwiki_global_vars.rx_wikilink_suffix
   " c) match DESCRIPTION within [[URL|DESCRIPTION]]
-  let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchDescr = g:vimwiki_global_vars.rx_wikilink_prefix.
-        \ g:vimwiki_global_vars.rxWikiLinkUrl . g:vimwiki_global_vars.rx_wikilink_separator.'\%('.
-        \ '\zs'. g:vimwiki_global_vars.rxWikiLinkDescr. '\ze\)\?'. g:vimwiki_global_vars.rx_wikilink_suffix
+  let g:vimwiki_syntax_variables[a:syntax].rxWikiLinkMatchDescr =
+        \ g:vimwiki_global_vars.rx_wikilink_prefix . g:vimwiki_global_vars.rxWikiLinkUrl
+        \ . g:vimwiki_global_vars.rx_wikilink_separator.'\%(\zs'
+        \ . g:vimwiki_global_vars.rxWikiLinkDescr. '\ze\)\?'
+        \ . g:vimwiki_global_vars.rx_wikilink_suffix
 
   if a:syntax ==# 'markdown'
     call s:populate_extra_markdown_vars()
@@ -516,9 +579,10 @@ function! s:populate_extra_markdown_vars()
 
   let mkd_syntax.rxMkdRef = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)'.
         \ mkd_syntax.rxWeblink0
-  let mkd_syntax.rxMkdRefMatchDescr = '\[\zs'.g:vimwiki_global_vars.rxWikiLinkDescr.'\ze]:\%(\s\+\|\n\)'.
-        \ mkd_syntax.rxWeblink0
-  let mkd_syntax.rxMkdRefMatchUrl = '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)\zs'.
+  let mkd_syntax.rxMkdRefMatchDescr =
+        \ '\[\zs'.g:vimwiki_global_vars.rxWikiLinkDescr.'\ze]:\%(\s\+\|\n\)'. mkd_syntax.rxWeblink0
+  let mkd_syntax.rxMkdRefMatchUrl =
+        \ '\['.g:vimwiki_global_vars.rxWikiLinkDescr.']:\%(\s\+\|\n\)\zs'.
         \ mkd_syntax.rxWeblink0.'\ze'
 endfunction
 
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 9cc5dd9..d795ba7 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -222,7 +222,7 @@ To remap one of these keys, either put it in your .vimrc like this >
 or, the better way, put it in a file .vim/ftplugin/vimwiki.vim like this >
     :nmap <silent><buffer> <Leader>wc <Plug>Vimwiki2HTML
 
-The latter has the advantage that the mapping is local to viwiki buffers in
+The latter has the advantage that the mapping is local to Vimwiki buffers in
 every case.
 
 Also note that some keys work in normal mode as well as in visual mode. If you
@@ -814,7 +814,7 @@ which opens up a popup menu with all the wiki files starting with "ind".
 When |vimwiki-option-maxhi| equals 1, a distinct highlighting style is used to
 identify wikilinks whose targets are not found.
 
-Interwiki:~
+Interwiki~
 
 If you maintain more than one wiki, you can create interwiki links between
 them by adding a numbered prefix "wikiX:" in front of a link: >
@@ -825,15 +825,11 @@ or: >
 The number behind "wiki" is in the range 0..N-1 and identifies the destination
 wiki in |g:vimwiki_list|.
 
-Diary:~
+Diary~
 
-The "diary:" scheme is used to concisely link to diary entries: >
+The "diary:" scheme is used to link to diary entries: >
   [[diary:2012-03-05]]
 
-This scheme precludes explicit inclusion of |vimwiki-option-diary_rel_path|,
-and is most useful on subwiki pages to avoid links such as: >
-  [[../../diary/2012-03-05]]
-
 Anchors~
 
 A wikilink, interwiki link or diary link can be followed by a '#' and the name
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index b75ea1f..f924ba3 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -238,7 +238,8 @@ command! -buffer Vimwiki2HTML
       \ let res = vimwiki#html#Wiki2HTML(expand(vimwiki#vars#get_wikilocal('path_html')),
       \                             expand('%'))
       \ <bar>
-      \ if res != '' | echo 'Vimwiki: HTML conversion is done, output: ' . expand(vimwiki#vars#get_wikilocal('path_html')) | endif
+      \ if res != '' | echo 'Vimwiki: HTML conversion is done, output: '
+      \      . expand(vimwiki#vars#get_wikilocal('path_html')) | endif
 command! -buffer Vimwiki2HTMLBrowse
       \ if filewritable(expand('%')) | silent noautocmd w | endif
       \ <bar>
@@ -281,11 +282,15 @@ command! -buffer VimwikiCheckLinks call vimwiki#base#check_links()
 
 " list commands
 command! -buffer -nargs=+ VimwikiReturn call <SID>CR(<f-args>)
-command! -buffer -range -nargs=1 VimwikiChangeSymbolTo call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'n')
-command! -buffer -range -nargs=1 VimwikiListChangeSymbolI call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'i')
-command! -buffer -nargs=1 VimwikiChangeSymbolInListTo call vimwiki#lst#change_marker_in_list(<f-args>)
+command! -buffer -range -nargs=1 VimwikiChangeSymbolTo
+      \ call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'n')
+command! -buffer -range -nargs=1 VimwikiListChangeSymbolI
+      \ call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'i')
+command! -buffer -nargs=1 VimwikiChangeSymbolInListTo
+      \ call vimwiki#lst#change_marker_in_list(<f-args>)
 command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
-command! -buffer -range -nargs=+ VimwikiListChangeLvl call vimwiki#lst#change_level(<line1>, <line2>, <f-args>)
+command! -buffer -range -nargs=+ VimwikiListChangeLvl
+      \ call vimwiki#lst#change_level(<line1>, <line2>, <f-args>)
 command! -buffer -range VimwikiRemoveSingleCB call vimwiki#lst#remove_cb(<line1>, <line2>)
 command! -buffer VimwikiRemoveCBInList call vimwiki#lst#remove_cb_in_list()
 command! -buffer VimwikiRenumberList call vimwiki#lst#adjust_numbered_list()
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 8f7fa87..6c2987b 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -49,7 +49,9 @@ function! s:create_temporary_wiki()
 endfunction
 
 
-" this is called when Vim opens a new buffer with a known wiki extension
+" This function is called when Vim opens a new buffer with a known wiki
+" extension. Both when the buffer has never been opened in this session and
+" when it has.
 function! s:setup_new_wiki_buffer() "{{{
   let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
   if wiki_nr == -1    " it's not in a known wiki directory
@@ -82,52 +84,16 @@ function! s:setup_buffer_enter() "{{{
     return
   endif
 
-  " 'autowriteall' is a global Vim option, so in order to change it only for
-  " Vimwiki buffers, we need to set it here (when the cursor enters the buffer)
-  " and reset it when the cursor leaves the buffer
-  let s:vimwiki_autowriteall_saved = &autowriteall
-  let &autowriteall = vimwiki#vars#get_global('autowriteall')
-
   if &filetype == ''
     setfiletype vimwiki
   endif
 
-  " The settings foldmethod, foldexpr and foldtext are local to window. Thus in
-  " a new tab with the same buffer folding is reset to vim defaults. So we
-  " insist vimwiki folding here.
-  let foldmethod = vimwiki#vars#get_global('folding')
-  if foldmethod ==? 'expr'
-    setlocal foldmethod=expr
-    setlocal foldexpr=VimwikiFoldLevel(v:lnum)
-    setlocal foldtext=VimwikiFoldText()
-  elseif foldmethod ==? 'list' || foldmethod ==? 'lists'
-    setlocal foldmethod=expr
-    setlocal foldexpr=VimwikiFoldListLevel(v:lnum)
-    setlocal foldtext=VimwikiFoldText()
-  elseif foldmethod ==? 'syntax'
-    setlocal foldmethod=syntax
-    setlocal foldtext=VimwikiFoldText()
-  else
-    setlocal foldmethod=manual
-    normal! zE
-  endif
+  call s:set_global_options()
 
-  " And conceal level too.
-  if vimwiki#vars#get_global('conceallevel') && exists("+conceallevel")
-    let &conceallevel = vimwiki#vars#get_global('conceallevel')
-  endif
-
-  " lcd as well
-  if vimwiki#vars#get_global('auto_chdir')
-    exe 'lcd' vimwiki#vars#get_wikilocal('path')
-  endif
-
-  " Set up menu
-  if vimwiki#vars#get_global('menu') !=# ''
-    exe 'nmenu enable '.vimwiki#vars#get_global('menu').'.Table'
-  endif
+  call s:set_windowlocal_options()
 endfunction "}}}
 
+
 function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
   " on colorscheme change because they are not linked to Vim-predefined groups
   hi def VimwikiBold term=bold cterm=bold gui=bold
@@ -136,7 +102,10 @@ function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
   hi def VimwikiUnderline gui=underline
   if vimwiki#vars#get_global('hl_headers') == 1
     for i in range(1,6)
-      execute 'hi def VimwikiHeader'.i.' guibg=bg guifg='.vimwiki#vars#get_global('hcolor_guifg_'.&bg)[i-1].' gui=bold ctermfg='.vimwiki#vars#get_global('hcolor_ctermfg_'.&bg)[i-1].' term=bold cterm=bold' 
+      execute 'hi def VimwikiHeader'.i.' guibg=bg guifg='
+            \ . vimwiki#vars#get_global('hcolor_guifg_'.&bg)[i-1]
+            \ .' gui=bold ctermfg='.vimwiki#vars#get_global('hcolor_ctermfg_'.&bg)[i-1]
+            \ .' term=bold cterm=bold'
     endfor
   endif
 endfunction "}}}
@@ -156,6 +125,50 @@ function! s:vimwiki_get_known_extensions() " {{{
   return keys(extensions)
 endfunction " }}}
 
+
+" Set settings which are global for Vim, but should only be executed for
+" Vimwiki buffers. So they must be set when the cursor enters a Vimwiki buffer
+" and reset when the cursor leaves the buffer.
+function! s:set_global_options()
+  let s:vimwiki_autowriteall_saved = &autowriteall
+  let &autowriteall = vimwiki#vars#get_global('autowriteall')
+
+  if vimwiki#vars#get_global('menu') !=# ''
+    exe 'nmenu enable '.vimwiki#vars#get_global('menu').'.Table'
+  endif
+endfunction
+
+
+" Set settings which are local to a window. In a new tab they would be reset to
+" Vim defaults. So we enforce our settings here when the cursor enters a
+" Vimwiki buffer.
+function! s:set_windowlocal_options()
+  let foldmethod = vimwiki#vars#get_global('folding')
+  if foldmethod ==? 'expr'
+    setlocal foldmethod=expr
+    setlocal foldexpr=VimwikiFoldLevel(v:lnum)
+    setlocal foldtext=VimwikiFoldText()
+  elseif foldmethod ==? 'list' || foldmethod ==? 'lists'
+    setlocal foldmethod=expr
+    setlocal foldexpr=VimwikiFoldListLevel(v:lnum)
+    setlocal foldtext=VimwikiFoldText()
+  elseif foldmethod ==? 'syntax'
+    setlocal foldmethod=syntax
+    setlocal foldtext=VimwikiFoldText()
+  else
+    setlocal foldmethod=manual
+    normal! zE
+  endif
+
+  if vimwiki#vars#get_global('conceallevel') && exists("+conceallevel")
+    let &conceallevel = vimwiki#vars#get_global('conceallevel')
+  endif
+
+  if vimwiki#vars#get_global('auto_chdir')
+    exe 'lcd' vimwiki#vars#get_wikilocal('path')
+  endif
+endfunction
+
 " }}}
 
 
@@ -201,8 +214,8 @@ endif
 augroup vimwiki
   autocmd!
   for s:ext in s:known_extensions
-    exe 'autocmd BufEnter *'.s:ext.' call s:setup_buffer_enter()'
     exe 'autocmd BufNewFile,BufRead *'.s:ext.' call s:setup_new_wiki_buffer()'
+    exe 'autocmd BufEnter *'.s:ext.' call s:setup_buffer_enter()'
     exe 'autocmd BufLeave *'.s:ext.' call s:setup_buffer_leave()'
     exe 'autocmd ColorScheme *'.s:ext.' call s:setup_cleared_syntax()'
     " Format tables when exit from insert mode. Do not use textwidth to

From 19f398c73eae6324437b5a645e4c172b2639e9ea Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 16 Feb 2018 07:26:42 +0100
Subject: [PATCH 051/108] Cherry-pick the changes from dev -- part 1

---
 autoload/vimwiki/html.vim | 12 +++++--
 autoload/vimwiki/lst.vim  | 16 ++++-----
 autoload/vimwiki/vars.vim |  5 +--
 doc/vimwiki.txt           | 75 +++++++++++++++++++++++++--------------
 syntax/vimwiki.vim        |  6 ++--
 5 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index a6a1f63..d01b056 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -860,7 +860,11 @@ function! s:process_tag_list(line, lists) "{{{
     let chk = matchlist(a:line, a:rx_list)
     if !empty(chk) && len(chk[1]) > 0
       let completion = index(vimwiki#vars#get_syntaxlocal('listsyms_list'), chk[1])
-      if completion >= 0 && completion <=4
+      let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+      if completion == 0
+        let st_tag = '<li class="done0">'
+      elseif completion > 0 && completion < n
+        let completion = float2nr(round(completion / (n-1.0) * 3.0 + 0.5 ))
         let st_tag = '<li class="done'.completion.'">'
       endif
     endif
@@ -979,7 +983,11 @@ function! s:process_tag_para(line, para) "{{{
       let para = 1
     endif
     let processed = 1
-    call add(lines, a:line)
+    if vimwiki#vars#get_global('text_ignore_newline')
+      call add(lines, a:line)
+    else
+      call add(lines, a:line."<br />")
+    endif
   elseif para && a:line =~# '^\s*$'
     call add(lines, "</p>")
     let para = 0
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 41ef51b..b959b75 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -697,7 +697,8 @@ function! s:get_rate(item) "{{{
     return -1
   endif
   let state = a:item.cb
-  return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 25
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 100/(n-1)
 endfunction "}}}
 
 "Set state of the list item to [ ] or [o] or whatever
@@ -732,17 +733,16 @@ endfunction "}}}
 
 "Returns: the appropriate symbol for a given percent rate
 function! s:rate_to_state(rate) "{{{
+  let listsyms_list = vimwiki#vars#get_syntaxlocal('listsyms_list')
   let state = ''
+  let n = len(listsyms_list)
   if a:rate == 100
-    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[4]
+    let state = listsyms_list[n-1]
   elseif a:rate == 0
-    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[0]
-  elseif a:rate >= 67
-    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[3]
-  elseif a:rate >= 34
-    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[2]
+    let state = listsyms_list[0]
   else
-    let state = vimwiki#vars#get_syntaxlocal('listsyms_list')[1]
+    let index = float2nr(ceil(a:rate/100.0*(n-2)))
+    let state = listsyms_list[index]
   endif
   return state
 endfunction "}}}
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 36fb9f5..ab0cf2a 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -47,6 +47,7 @@ function! s:populate_global_variables()
         \ 'html_header_numbering': 0,
         \ 'html_header_numbering_sym': '',
         \ 'list_ignore_newline': 1,
+        \ 'text_ignore_newline': 1,
         \ 'listsyms': ' .oOX',
         \ 'map_prefix': '<Leader>w',
         \ 'menu': 'Vimwiki',
@@ -384,13 +385,13 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   if g:vimwiki_syntax_variables[a:syntax].recurring_bullets
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
           \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\['
-          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\%('
+          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1].'\]\s.*\%(\n\%(\1\%('
           \ .g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\).*\|^$\|\s.*\)\)*'
   else
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
           \ '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'
           \ . g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['
-          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[4].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
+          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
   endif
 
   " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index d795ba7..6baceec 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -1277,40 +1277,50 @@ Tags-related commands and options:
 6. Folding/Outline                                           *vimwiki-folding*
 
 Vimwiki can fold or outline sections using headers and preformatted blocks.
-Alternatively, one can fold list subitems instead.
+Alternatively, one can fold list subitems instead. Folding is not enabled
+by default, and requires the |g:vimwiki_folding| variable to be set.
+
+Example for list folding with |g:vimwiki_folding| set to 'list':
 
-Example for list folding:
 = My current task =
-  * [ ] Do stuff 1
-    * [ ] Do substuff 1.1
-    * [ ] Do substuff 1.2
-      * [ ] Do substuff 1.2.1
-      * [ ] Do substuff 1.2.2
-    * [ ] Do substuff 1.3
-  * [ ] Do stuff 2
-  * [ ] Do stuff 3
+* [ ] Do stuff 1
+  * [ ] Do substuff 1.1
+  * [ ] Do substuff 1.2
+    * [ ] Do substuff 1.2.1
+    * [ ] Do substuff 1.2.2
+  * [ ] Do substuff 1.3
+* [ ] Do stuff 2
+* [ ] Do stuff 3
 
 Hit |zM| :
-= My current task = [8] --------------------------------------~
+= My current task =
+* [ ] Do stuff 1 [6] --------------------------------------~
+* [ ] Do stuff 2
+* [ ] Do stuff 3
 
 Hit |zr| :
-= My current task =~
-  * [ ] Do stuff 1 [5] --------------------------------------~
-  * [ ] Do stuff 2~
-  * [ ] Do stuff 3~
+= My current task =
+* [ ] Do stuff 1
+  * [ ] Do substuff 1.1
+  * [ ] Do substuff 1.2 [3] -------------------------------~
+  * [ ] Do substuff 1.3
+* [ ] Do stuff 2
+* [ ] Do stuff 3
 
-Hit |zr| one more time:
-= My current task =~
-  * [ ] Do stuff 1~
-    * [ ] Do substuff 1.1~
-    * [ ] Do substuff 1.2 [2] -------------------------------~
-    * [ ] Do substuff 1.3~
-  * [ ] Do stuff 2~
-  * [ ] Do stuff 3~
+Hit |zr| one more time :
+= My current task =
+* [ ] Do stuff 1
+  * [ ] Do substuff 1.1
+  * [ ] Do substuff 1.2
+    * [ ] Do substuff 1.2.1
+    * [ ] Do substuff 1.2.2
+  * [ ] Do substuff 1.3
+* [ ] Do stuff 2
+* [ ] Do stuff 3
 
 Note: If you use the default Vimwiki syntax, folding on list items will work
 properly only if all of them are indented using the current 'shiftwidth'.
-For MediaWiki, * or # should be in the first column.
+For MediaWiki syntax, * or # should be in the first column.
 
 To turn folding on/off check |g:vimwiki_folding|.
 
@@ -2241,11 +2251,11 @@ Default: 'Vimwiki'
 ------------------------------------------------------------------------------
 *g:vimwiki_listsyms*
 
-String of 5 symbols to show the progression of todo list items.
+String of at least two symbols to show the progression of todo list items.
 Default value is ' .oOX'.
 
 The first char is for 0% done items.
-The fifth is for 100% done items.
+The last is for 100% done items.
 
 You can set it to some more fancy symbols like this:
 >
@@ -2298,6 +2308,19 @@ Value           Description~
 Default: 1
 
 
+------------------------------------------------------------------------------
+*g:vimwiki_text_ignore_newline*
+
+This is HTML related.
+Convert newlines to <br />s in text.
+
+Value           Description~
+0               Newlines in text are converted to <br />s.
+1               Ignore newlines.
+
+Default: 1
+
+
 ------------------------------------------------------------------------------
 *g:vimwiki_use_calendar*
 
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 44c07fe..e035711 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -235,9 +235,9 @@ execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListDefine'
 execute 'syntax match VimwikiListTodo /'.vimwiki#vars#get_syntaxlocal('rxListItem').'/'
 
 if vimwiki#vars#get_global('hl_cb_checked') == 1
-  execute 'syntax match VimwikiCheckBoxDone '
-        \ . ' /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[4].'\]\s.*$/'
-        \ . ' contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB')
+        \ .'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[-1]
+        \ .'\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 elseif vimwiki#vars#get_global('hl_cb_checked') == 2
   execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemAndChildren').'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 endif

From 7d4254a75df7b899dc99062663280433bd75c217 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 16 Feb 2018 17:47:32 +0100
Subject: [PATCH 052/108] Cherry-pick the changes from dev -- part2

---
 autoload/vimwiki/base.vim          | 96 +++++++++++++++++++-----------
 autoload/vimwiki/markdown_base.vim | 55 -----------------
 autoload/vimwiki/path.vim          |  8 ++-
 doc/vimwiki.txt                    | 35 ++++++++++-
 ftplugin/vimwiki.vim               | 10 ++--
 5 files changed, 105 insertions(+), 99 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 4bc45af..14709a6 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -98,7 +98,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
     let source_file = a:1
   else
     let source_wiki = vimwiki#vars#get_bufferlocal('wiki_nr')
-    let source_file = expand('%:p')
+    let source_file = vimwiki#path#current_wiki_file()
   endif
 
   let link_text = a:link_text
@@ -257,7 +257,7 @@ function! vimwiki#base#open_link(cmd, link, ...) "{{{
         \ || link_infos.scheme =~# 'diary'
 
   let update_prev_link = is_wiki_link &&
-        \ !vimwiki#path#is_equal(link_infos.filename, expand('%:p'))
+        \ !vimwiki#path#is_equal(link_infos.filename, vimwiki#path#current_wiki_file())
 
   let vimwiki_prev_link = []
   " update previous link for wiki pages
@@ -265,7 +265,7 @@ function! vimwiki#base#open_link(cmd, link, ...) "{{{
     if a:0
       let vimwiki_prev_link = [a:1, []]
     elseif &ft ==# 'vimwiki'
-      let vimwiki_prev_link = [expand('%:p'), getpos('.')]
+      let vimwiki_prev_link = [vimwiki#path#current_wiki_file(), getpos('.')]
     endif
   endif
 
@@ -1076,57 +1076,81 @@ function! vimwiki#base#find_prev_link() "{{{
 endfunction " }}}
 
 " vimwiki#base#follow_link
-function! vimwiki#base#follow_link(split, ...) "{{{ Parse link at cursor and pass 
-  " to VimwikiLinkHandler, or failing that, the default open_link handler
-  if exists('*vimwiki#'.vimwiki#vars#get_wikilocal('syntax').'_base#follow_link')
-    " Syntax-specific links
-    " XXX: @Stuart: do we still need it?
-    " XXX: @Maxim: most likely!  I am still working on a seemless way to
-    " integrate regexp's without complicating syntax/vimwiki.vim
-    if a:0
-      call vimwiki#{vimwiki#vars#get_wikilocal('syntax')}_base#follow_link(a:split, a:1)
-    else
-      call vimwiki#{vimwiki#vars#get_wikilocal('syntax')}_base#follow_link(a:split)
+function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
+  " Parse link at cursor and pass to VimwikiLinkHandler, or failing that, the
+  " default open_link handler
+
+  " try WikiLink
+  let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink')),
+        \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
+  " try WikiIncl
+  if lnk == ""
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiIncl')),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiInclMatchUrl'))
+  endif
+  " try Weblink
+  if lnk == ""
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink')),
+          \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
+  endif
+
+  if lnk != ""    " cursor is indeed on a link
+    let processed_by_user_defined_handler = VimwikiLinkHandler(lnk)
+    if processed_by_user_defined_handler
+      return
     endif
-  else
-    if a:split ==# "split"
+
+    if a:split ==# "hsplit"
       let cmd = ":split "
     elseif a:split ==# "vsplit"
       let cmd = ":vsplit "
-    elseif a:split ==# "tabnew"
+    elseif a:split ==# "tab"
       let cmd = ":tabnew "
     else
       let cmd = ":e "
     endif
 
-    " try WikiLink
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink')),
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
-    " try WikiIncl
-    if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
-          \ vimwiki#vars#get_global('rxWikiInclMatchUrl'))
-    endif
-    " try Weblink
-    if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink')),
-            \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
-    endif
-
-    if lnk != ""
-      if !VimwikiLinkHandler(lnk)
-        call vimwiki#base#open_link(cmd, lnk)
+    " if we want to and can reuse a split window, jump to that window and open
+    " the new file there
+    if (a:split ==# 'hsplit' || a:split ==# 'vsplit') && a:reuse
+      let previous_window_nr = winnr('#')
+      if previous_window_nr > 0 && previous_window_nr != winnr()
+        execute previous_window_nr . 'wincmd w'
+        let cmd = ':e'
       endif
-      return
     endif
 
+
+    if vimwiki#vars#get_wikilocal('syntax') == 'markdown'
+      let processed_by_markdown_reflink = vimwiki#markdown_base#open_reflink(lnk)
+      if processed_by_markdown_reflink
+        return
+      endif
+
+      " remove the extension from the filename if exists, because non-vimwiki
+      " markdown files usually include the extension in links
+      let lnk = substitute(lnk, vimwiki#vars#get_wikilocal('ext').'$', '', '')
+    endif
+
+    let current_tab_page = tabpagenr()
+
+    call vimwiki#base#open_link(cmd, lnk)
+
+    if !a:move_cursor
+      if (a:split ==# 'hsplit' || a:split ==# 'vsplit')
+        execute 'wincmd p'
+      elseif a:split ==# 'tab'
+        execute 'tabnext ' . current_tab_page
+      endif
+    endif
+
+  else
     if a:0 > 0
       execute "normal! ".a:1
     else		
       call vimwiki#base#normalize_link(0)
     endif
   endif
-
 endfunction " }}}
 
 " vimwiki#base#go_back_link
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index a207f53..021b44a 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -48,61 +48,6 @@ endfunction " }}}
 
 " WIKI link following functions {{{
 
-" vimwiki#markdown_base#follow_link
-function! vimwiki#markdown_base#follow_link(split, ...) "{{{ Parse link at cursor and pass 
-  " to VimwikiLinkHandler, or failing that, the default open_link handler
-  " echom "markdown_base#follow_link"
-
-  if 0
-    " Syntax-specific links
-    " XXX: @Stuart: do we still need it?
-    " XXX: @Maxim: most likely!  I am still working on a seemless way to
-    " integrate regexp's without complicating syntax/vimwiki.vim
-  else
-    if a:split ==# "split"
-      let cmd = ":split "
-    elseif a:split ==# "vsplit"
-      let cmd = ":vsplit "
-    elseif a:split ==# "tabnew"
-      let cmd = ":tabnew "
-    else
-      let cmd = ":e "
-    endif
-
-    " try WikiLink
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink')),
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
-    " try WikiIncl
-    if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
-          \ vimwiki#vars#get_global('rxWikiInclMatchUrl'))
-    endif
-    " try Weblink
-    if lnk == ""
-      let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink')),
-            \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
-    endif
-
-    if lnk != ""
-      if !VimwikiLinkHandler(lnk)
-        if !vimwiki#markdown_base#open_reflink(lnk)
-          " remove the extension from the filename if exists
-          let lnk = substitute(lnk, vimwiki#vars#get_wikilocal('ext').'$', '', '')
-          call vimwiki#base#open_link(cmd, lnk)
-        endif
-      endif
-      return
-    endif
-
-    if a:0 > 0
-      execute "normal! ".a:1
-    else		
-      call vimwiki#base#normalize_link(0)
-    endif
-  endif
-
-endfunction " }}}
-
 " LINK functions {{{
 
 " s:normalize_link_syntax_n
diff --git a/autoload/vimwiki/path.vim b/autoload/vimwiki/path.vim
index ffa48c3..263466c 100644
--- a/autoload/vimwiki/path.vim
+++ b/autoload/vimwiki/path.vim
@@ -75,7 +75,7 @@ function! vimwiki#path#path_common_pfx(path1, path2) "{{{
 endfunction "}}}
 
 function! vimwiki#path#wikify_path(path) "{{{
-  let result = resolve(expand(a:path, ':p'))
+  let result = resolve(fnamemodify(a:path, ':p'))
   if vimwiki#u#is_windows()
     let result = substitute(result, '\\', '/', 'g')
   endif
@@ -83,6 +83,12 @@ function! vimwiki#path#wikify_path(path) "{{{
   return result
 endfunction "}}}
 
+
+function! vimwiki#path#current_wiki_file()
+  return vimwiki#path#wikify_path(expand('%:p'))
+endfunction
+
+
 " Returns: the relative path from a:dir to a:file
 function! vimwiki#path#relpath(dir, file) "{{{
   let result = []
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 6baceec..7e236ad 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -363,7 +363,7 @@ glh                     Decrease the level of a list item.
 gLh                     Decrease the level of a list item and all child items.
                         To remap: >
                         :map << <Plug>VimwikiDecreaseLvlSingleItem
-                        :map >>> <Plug>VimwikiDecreaseLvlWholeItem
+                        :map <<< <Plug>VimwikiDecreaseLvlWholeItem
 <
                         *vimwiki_glr* *vimwiki_gLr*
 glr                     Renumber list items if the cursor is on a numbered
@@ -594,6 +594,9 @@ il                      A single list item.
 ------------------------------------------------------------------------------
 4.2. Local commands                                   *vimwiki-local-commands*
 
+These commands are only available (and meaningful) when you are currently in a
+Vimwiki file.
+
 *:VimwikiFollowLink*
     Follow wiki link (or create target wiki page if needed).
 
@@ -742,6 +745,34 @@ il                      A single list item.
     their instances.  Supports |cmdline-completion|.  If
     no arguments (tags) are specified, outputs all tags.
 
+------------------------------------------------------------------------------
+4.3. Functions                                              *vimwiki-functions*
+
+Functions to interact with Vimwiki. (It's intended that most commands will be
+replaced with corresponding function calls in the future.)
+Warning: this is currently unstable and likely to change.
+
+
+To map them to a key, use >
+ nnoremap <C-K> :call vimwiki#base#function_name(arg1, arg2)<CR>
+
+
+vimwiki#base#follow_link({split}, {reuse}, {move_cursor})         *follow_link*
+    Open the link under the cursor. {split} can have the following values:
+        'nosplit'       open the link in the current window
+        'vsplit'        open in a vertically split window
+        'hsplit'        open in a horizontally split window
+        'tab'           open in a new tab
+
+    If {reuse} is 1 and {split} one of 'vsplit' or 'hsplit', open the link in
+    a possibly existing split window instead of making a new split.
+
+    If {move_cursor} is 1 the cursor moves to the window or tab with the
+    opened link, otherwise, it stays in the window or tab with the link.
+
+    For example, <CR> is per default mapped to
+    vimwiki#base#follow_link('nosplit', 0, 1)
+
 
 ==============================================================================
 5. Wiki syntax                                                *vimwiki-syntax*
@@ -850,7 +881,7 @@ Raw URLs are also supported: >
 
 External files~
 
-The "file:" and "local:" schemes allow you to directly link to arbitray
+The "file:" and "local:" schemes allow you to directly link to arbitrary
 resources using absolute or relative paths: >
   [[file:/home/somebody/a/b/c/music.mp3]]
   [[file:C:/Users/somebody/d/e/f/music.mp3]]
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index f924ba3..4e747a3 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -255,14 +255,14 @@ command! -buffer VimwikiNextLink call vimwiki#base#find_next_link()
 command! -buffer VimwikiPrevLink call vimwiki#base#find_prev_link()
 command! -buffer VimwikiDeleteLink call vimwiki#base#delete_link()
 command! -buffer VimwikiRenameLink call vimwiki#base#rename_link()
-command! -buffer VimwikiFollowLink call vimwiki#base#follow_link('nosplit')
+command! -buffer VimwikiFollowLink call vimwiki#base#follow_link('nosplit', 0, 1)
 command! -buffer VimwikiGoBackLink call vimwiki#base#go_back_link()
-command! -buffer VimwikiSplitLink call vimwiki#base#follow_link('split')
-command! -buffer VimwikiVSplitLink call vimwiki#base#follow_link('vsplit')
+command! -buffer VimwikiSplitLink call vimwiki#base#follow_link('hsplit', 0, 1)
+command! -buffer VimwikiVSplitLink call vimwiki#base#follow_link('vsplit', 0, 1)
 
 command! -buffer -nargs=? VimwikiNormalizeLink call vimwiki#base#normalize_link(<f-args>)
 
-command! -buffer VimwikiTabnewLink call vimwiki#base#follow_link('tabnew')
+command! -buffer VimwikiTabnewLink call vimwiki#base#follow_link('tab', 0, 1)
 
 command! -buffer VimwikiGenerateLinks call vimwiki#base#generate_links()
 
@@ -322,7 +322,7 @@ command! -buffer -nargs=* -complete=custom,vimwiki#tags#complete_tags
 if vimwiki#vars#get_global('use_mouse')
   nmap <buffer> <S-LeftMouse> <NOP>
   nmap <buffer> <C-LeftMouse> <NOP>
-  nnoremap <silent><buffer> <2-LeftMouse> :call vimwiki#base#follow_link("nosplit", "\<lt>2-LeftMouse>")<CR>
+  nnoremap <silent><buffer> <2-LeftMouse> :call vimwiki#base#follow_link('nosplit', 0, 1, "\<lt>2-LeftMouse>")<CR>
   nnoremap <silent><buffer> <S-2-LeftMouse> <LeftMouse>:VimwikiSplitLink<CR>
   nnoremap <silent><buffer> <C-2-LeftMouse> <LeftMouse>:VimwikiVSplitLink<CR>
   nnoremap <silent><buffer> <RightMouse><LeftMouse> :VimwikiGoBackLink<CR>

From 73bda6b9ab98025a994013e9a39613f507b7a5d9 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 16 Feb 2018 18:11:49 +0100
Subject: [PATCH 053/108] Cherry-pick the changes from dev -- part3

---
 README.md                          | 11 ++++++++-
 autoload/vimwiki/diary.vim         | 12 +++++-----
 autoload/vimwiki/html.vim          | 34 ++++++++++++++++++++++----
 autoload/vimwiki/markdown_base.vim |  2 +-
 autoload/vimwiki/vars.vim          |  2 +-
 doc/vimwiki.txt                    | 38 +++++++++++++++++++++++-------
 ftplugin/vimwiki.vim               |  4 ++--
 plugin/vimwiki.vim                 |  2 ++
 syntax/vimwiki.vim                 |  7 +++---
 9 files changed, 85 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 5816229..a407040 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ A Personal Wiki For Vim
 ==============================================================================
 
 ![screenshot1](doc/screenshot_1.png)
-![screenshot2](doc/screenshot_2.png)
+![screenshot2](doc/screenshot_2.png) *
 
 Intro
 ------------------------------------------------------------------------------
@@ -122,6 +122,11 @@ Make sure you have these settings in your vimrc file:
 Without them Vimwiki will not work properly.
 
 
+Installation using [Vim packages](http://vimhelp.appspot.com/repeat.txt.html#packages) (since Vim 7.4.1528)
+------------------------------------------------------------------------------
+
+    git clone https://github.com/vimwiki/vimwiki.git ~/.vim/pack/plugins/start/vimwiki
+
 Installation using [Pathogen](http://www.vim.org/scripts/script.php?script_id=2332)
 ------------------------------------------------------------------------------
 
@@ -140,3 +145,7 @@ Add `Plugin 'vimwiki/vimwiki'` to your vimrc file and run
 Or download the [zip archive](https://github.com/vimwiki/vimwiki/archive/master.zip) and extract it in `~/.vim/bundle/`
 
 Then launch Vim, run `:Helptags` and then `:help vimwiki` to verify it was installed.
+
+----
+\* Screenshots made with the [solarized colorscheme](https://github.com/altercation/vim-colors-solarized)
+and [lightline](https://github.com/itchyny/lightline.vim)
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 3f662ed..253f11c 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -42,7 +42,7 @@ function! s:get_position_links(link) "{{{
   let idx = -1
   let links = []
   if a:link =~# '^\d\{4}-\d\d-\d\d'
-    let links = keys(s:get_diary_links())
+    let links = map(s:get_diary_files(), 'fnamemodify(v:val, ":t:r")')
     " include 'today' into links
     if index(links, vimwiki#diary#diary_date_link()) == -1
       call add(links, vimwiki#diary#diary_date_link())
@@ -83,7 +83,7 @@ fun! s:read_captions(files) "{{{
   return result
 endfun "}}}
 
-fun! s:get_diary_links() "{{{
+fun! s:get_diary_files() "{{{
   let rx = '^\d\{4}-\d\d-\d\d'
   let s_files = glob(vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.vimwiki#vars#get_wikilocal('ext'))
   let files = split(s_files, '\n')
@@ -92,9 +92,7 @@ fun! s:get_diary_links() "{{{
   " remove backup files (.wiki~)
   call filter(files, 'v:val !~# ''.*\~$''')
 
-  let links_with_captions = s:read_captions(files)
-
-  return links_with_captions
+  return files
 endfun "}}}
 
 fun! s:group_links(links) "{{{
@@ -129,7 +127,9 @@ endfunction "}}}
 function! s:format_diary() "{{{
   let result = []
 
-  let g_files = s:group_links(s:get_diary_links())
+
+  let links_with_captions = s:read_captions(s:get_diary_files())
+  let g_files = s:group_links(links_with_captions)
 
   for year in s:sort(keys(g_files))
     call add(result, '')
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index d01b056..43b90cb 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -209,6 +209,19 @@ function! s:save_vimwiki_buffer() "{{{
   endif
 endfunction "}}}
 
+" get date.
+function! s:process_date(placeholders, default_date) "{{{
+  if !empty(a:placeholders)
+    for [placeholder, row, idx] in a:placeholders
+      let [type, param] = placeholder
+      if type ==# 'date' && !empty(param)
+        return param
+      endif
+    endfor
+  endif
+  return a:default_date
+endfunction "}}}
+
 " get title.
 function! s:process_title(placeholders, default_title) "{{{
   if !empty(a:placeholders)
@@ -1190,7 +1203,7 @@ function! s:parse_line(line, state) " {{{
 
   " nohtml -- placeholder
   if !processed
-    if line =~# '^\s*%nohtml'
+    if line =~# '\m^\s*%nohtml\s*$'
       let processed = 1
       let state.placeholder = ['nohtml']
     endif
@@ -1198,18 +1211,27 @@ function! s:parse_line(line, state) " {{{
 
   " title -- placeholder
   if !processed
-    if line =~# '^\s*%title'
+    if line =~# '\m^\s*%title\%(\s.*\)\?$'
       let processed = 1
-      let param = matchstr(line, '^\s*%title\s\zs.*')
+      let param = matchstr(line, '\m^\s*%title\s\+\zs.*')
       let state.placeholder = ['title', param]
     endif
   endif
 
+  " date -- placeholder
+  if !processed
+    if line =~# '\m^\s*%date\%(\s.*\)\?$'
+      let processed = 1
+      let param = matchstr(line, '\m^\s*%date\s\+\zs.*')
+      let state.placeholder = ['date', param]
+    endif
+  endif
+
   " html template -- placeholder "{{{
   if !processed
-    if line =~# '^\s*%template'
+    if line =~# '\m^\s*%template\%(\s.*\)\?$'
       let processed = 1
-      let param = matchstr(line, '^\s*%template\s\zs.*')
+      let param = matchstr(line, '\m^\s*%template\s\+\zs.*')
       let state.placeholder = ['template', param]
     endif
   endif
@@ -1483,11 +1505,13 @@ function! s:convert_file(path_html, wikifile) "{{{
     call extend(ldest, lines)
 
     let title = s:process_title(placeholders, fnamemodify(a:wikifile, ":t:r"))
+    let date = s:process_date(placeholders, strftime('%Y-%m-%d'))
 
     let html_lines = s:get_html_template(template_name)
 
     " processing template variables (refactor to a function)
     call map(html_lines, 'substitute(v:val, "%title%", "'. title .'", "g")')
+    call map(html_lines, 'substitute(v:val, "%date%", "'. date .'", "g")')
     call map(html_lines, 'substitute(v:val, "%root_path%", "'.
           \ s:root_path(vimwiki#vars#get_bufferlocal('subdir')) .'", "g")')
 
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index 021b44a..f55be2d 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -123,7 +123,7 @@ function! s:normalize_link_syntax_v() " {{{
     call setreg('"', link, 'v')
 
     " paste result
-    norm! `>pgvd
+    norm! `>""pgvd
 
   finally
     call setreg('"', rv, rt)
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index ab0cf2a..01b2263 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -77,7 +77,7 @@ function! s:populate_global_variables()
   let g:vimwiki_global_vars.schemes = 'wiki\d\+,diary,local'
   let g:vimwiki_global_vars.web_schemes1 = 'http,https,file,ftp,gopher,telnet,nntp,ldap,rsync'.
         \ ',imap,pop,irc,ircs,cvs,svn,svn+ssh,git,ssh,fish,sftp'
-  let web_schemes2 = 'mailto,news,xmpp,sip,sips,doi,urn,tel'
+  let web_schemes2 = 'mailto,news,xmpp,sip,sips,doi,urn,tel,data'
 
   let rx_schemes = '\%('.
         \ join(split(g:vimwiki_global_vars.schemes, '\s*,\s*'), '\|').'\|'.
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 7e236ad..551d2e8 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -742,8 +742,9 @@ Vimwiki file.
 
 *:VimwikiGenerateTags* tagname1 tagname2 ...
     Creates or updates an overview on all tags of the wiki with links to all
-    their instances.  Supports |cmdline-completion|.  If
-    no arguments (tags) are specified, outputs all tags.
+    their instances.  Supports |cmdline-completion|.  If no arguments (tags)
+    are specified, outputs all tags.  To make this command work properly, make
+    sure the tags have been built (see |vimwiki-build-tags|).
 
 ------------------------------------------------------------------------------
 4.3. Functions                                              *vimwiki-functions*
@@ -755,9 +756,10 @@ Warning: this is currently unstable and likely to change.
 
 To map them to a key, use >
  nnoremap <C-K> :call vimwiki#base#function_name(arg1, arg2)<CR>
+<
 
-
-vimwiki#base#follow_link({split}, {reuse}, {move_cursor})         *follow_link*
+                                                          *vimwiki-follow_link*
+vimwiki#base#follow_link({split}, {reuse}, {move_cursor})
     Open the link under the cursor. {split} can have the following values:
         'nosplit'       open the link in the current window
         'vsplit'        open in a vertically split window
@@ -1171,7 +1173,8 @@ This might be useful for coloring program code with external JS tools
 such as Google's syntax highlighter.
 
 You can setup Vimwiki to highlight code snippets in preformatted text.
-See |vimwiki-option-nested_syntaxes|
+See |vimwiki-option-nested_syntaxes| and
+|vimwiki-option-automatic_nested_syntaxes|.
 
 
 ------------------------------------------------------------------------------
@@ -1291,8 +1294,9 @@ which opens up a popup menu with all tags defined in the wiki starting with
 
 Tags are also treated as |vimwiki-anchors| (similar to bold text).
 
-Note that tag search/jump/completion commands need certain metadata saved in
-the wiki folder.  This metadata file can be manually updated by running
+                                                          *vimwiki-build-tags*
+Note that the tag search/jump/completion commands need certain metadata saved
+in the wiki folder.  This metadata file can be manually updated by running
 |:VimwikiRebuildTags|.  When the option |vimwiki-option-auto_tags| is enabled,
 the tags metadata will be auto-updated on each page save.
 
@@ -1391,6 +1395,18 @@ into it.
 
 See |vimwiki-option-template_path| for details.
 
+------------------------------------------------------------------------------
+%date                                                           *vimwiki-date*
+
+The date of the wiki page. The value can be used in the HTML template, see
+|vimwiki-option-template_path| for details.
+
+%date 2017-07-08
+%date
+
+If you omit the date after the placeholder, the date of the HTML conversion is
+used.
+
 
 ==============================================================================
 8. Lists                                                       *vimwiki-lists*
@@ -1942,11 +1958,13 @@ Each template could look like: >
         <div class="content">
         %content%
         </div>
+        <p><small>Page created on %date%</small></p>
     </body>
     </html>
 
 where
   %title% is replaced by a wiki page name or by a |vimwiki-title|
+  %date% is replaced with the current date or by |vimwiki-date|
   %root_path% is replaced by a count of ../ for pages buried in subdirs:
     if you have wikilink [[dir1/dir2/dir3/my page in a subdir]] then
     %root_path% is replaced by '../../../'.
@@ -2067,7 +2085,9 @@ Just write your preformatted text in your file like this >
  my preformatted text
  }}}
 
-where xxx is a Vim filetype.
+where xxx is a filetype which is known to Vim. For example, for C++
+highlighting, use "cpp" (not "c++"). For a list of known filetypes, type
+":setf " and hit Ctrl+d.
 
 Note that you may have to reload the file (|:edit|) to see the highlight.
 
@@ -2316,6 +2336,8 @@ Value           Description~
 'expr'          Folding based on expression (folds sections and code blocks)
 'syntax'        Folding based on syntax (folds sections; slower than 'expr')
 'list'          Folding based on expression (folds list subitems; much slower)
+'custom'        Leave the folding settings as they are (e.g. set by another
+                plugin)
 
 Default: ''
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 4e747a3..b3a0aa1 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -473,8 +473,8 @@ if !hasmapto('<Plug>VimwikiListToggle', 'i')
 endif
 inoremap <silent><script><buffer> <Plug>VimwikiListToggle <Esc>:VimwikiListToggle<CR>
 
-nnoremap <silent> <buffer> o :call vimwiki#lst#kbd_o()<CR>
-nnoremap <silent> <buffer> O :call vimwiki#lst#kbd_O()<CR>
+nnoremap <silent> <buffer> o :<C-U>call vimwiki#lst#kbd_o()<CR>
+nnoremap <silent> <buffer> O :<C-U>call vimwiki#lst#kbd_O()<CR>
 
 if !hasmapto('<Plug>VimwikiRenumberList')
   nmap <silent><buffer> glr <Plug>VimwikiRenumberList
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 6c2987b..8d1ffaa 100644
--- 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
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index e035711..43e769e 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -282,9 +282,10 @@ execute 'syntax region VimwikiMath start=/'.vimwiki#vars#get_syntaxlocal('rxMath
 
 " placeholders
 syntax match VimwikiPlaceholder /^\s*%nohtml\s*$/
-syntax match VimwikiPlaceholder /^\s*%title\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
-syntax match VimwikiPlaceholder /^\s*%template\%(\s.*\)\?$/ contains=VimwikiPlaceholderParam
-syntax match VimwikiPlaceholderParam /\s.*/ contained
+syntax match VimwikiPlaceholder /^\s*%title\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
+syntax match VimwikiPlaceholder /^\s*%date\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
+syntax match VimwikiPlaceholder /^\s*%template\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
+syntax match VimwikiPlaceholderParam /.*/ contained
 
 " html tags
 if vimwiki#vars#get_global('valid_html_tags') != ''

From 3756c6258baf4b089df870ae2c7112915bb09df5 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 16 Feb 2018 21:42:32 +0100
Subject: [PATCH 054/108] Cherry-pick the changes from dev -- part4

---
 autoload/vimwiki/html.vim |  3 ++-
 doc/vimwiki.txt           | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 43b90cb..075ab1f 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1394,7 +1394,8 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
       \ (len(vimwiki#vars#get_wikilocal('template_path')) > 1 ? shellescape(expand(vimwiki#vars#get_wikilocal('template_path'))) : '-'). ' '.
       \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ? vimwiki#vars#get_wikilocal('template_default') : '-'). ' '.
       \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ? vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '.
-      \ (len(vimwiki#vars#get_bufferlocal('subdir'))           > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir')))   : '-'))
+      \ (len(vimwiki#vars#get_bufferlocal('subdir')) > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir'))) : '-'). ' '.
+      \ (len(vimwiki#vars#get_global('custom_wiki2html_args')) > 0 ? vimwiki#vars#get_global('custom_wiki2html_args') : '-'))
 endfunction " }}}
 
 function! s:convert_file(path_html, wikifile) "{{{
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 551d2e8..2cc2c4e 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -2157,8 +2157,12 @@ The following arguments, in this order, are passed to the script:
 10. root_path : a count of ../ for pages buried in subdirs
     For example, if you have wikilink [[dir1/dir2/dir3/my page in a subdir]]
     then this argument is '../../../'.
+11. custom_args : custom arguments that will be passed to the conversion
+    (can be defined in g:vimwiki_list as 'custom_wiki2html_args' parameter,
+    see |vimwiki-option-custom_wiki2html_args|)
+    script.
 
-Options 7-10 are experimental and may change in the future.  If any of these
+Options 7-11 are experimental and may change in the future.  If any of these
 parameters is empty, a hyphen "-" is passed to the script in its place.
 
 For an example and further instructions, refer to the following script:
@@ -2171,6 +2175,17 @@ be located at https://github.com/vimwiki-backup/vimwiki/issues/384
 To use the internal wiki2html converter, use an empty string (the default).
 
 
+vimwiki-option-custom_wiki2html_args
+-----------------------------------------------------------------------------
+Key                     Default value~
+custom_wiki2html_args   ''
+
+Description
+If a custom script is called with |vimwiki-option-custom_wiki2html|, additional
+parameters can be passed by setting them using 'custom_wiki2html_args' in
+|g:vimwiki_list|.
+
+
 *vimwiki-option-list_margin*
 ------------------------------------------------------------------------------
 Key               Default value~

From f60993249a06e01710992934492d4dfea52d6851 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 17 Feb 2018 21:05:06 +0100
Subject: [PATCH 055/108] Cherry-pick the changes from dev -- part5

---
 autoload/vimwiki/lst.vim | 82 ++++++++++++++++++++++++++++++++--------
 doc/vimwiki.txt          | 15 +++++++-
 ftplugin/vimwiki.vim     | 19 ++++++++++
 3 files changed, 99 insertions(+), 17 deletions(-)

diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index b959b75..3832ba9 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -813,6 +813,67 @@ function! s:remove_cb(item) "{{{
   return item
 endfunction "}}}
 
+"Change state of checkbox
+"in the lines of the given range
+function! s:change_cb(from_line, to_line, new_rate) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  let parent_items_of_lines = []
+
+  for cur_ln in range(from_item.lnum, a:to_line)
+    let cur_item = s:get_item(cur_ln)
+    if cur_item.type != 0 && cur_item.cb != ''
+      call s:set_state_plus_children(cur_item, a:new_rate)
+      let cur_parent_item = s:get_parent(cur_item)
+      if index(parent_items_of_lines, cur_parent_item) == -1
+        call insert(parent_items_of_lines, cur_parent_item)
+      endif
+    endif
+  endfor
+
+  for parent_item in parent_items_of_lines
+    call s:update_state(parent_item)
+  endfor
+
+endfunction "}}}
+
+"Decrement checkbox between [ ] and [X]
+"in the lines of the given range
+function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  "if from_line has CB, decrement it and set all siblings to the same new state
+  let rate_first_line = s:get_rate(from_item)
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  let new_rate = max([rate_first_line - 100/(n-1)-1, 0])
+
+  call s:change_cb(a:from_line, a:to_line, new_rate)
+
+endfunction "}}}
+
+"Increment checkbox between [ ] and [X]
+"in the lines of the given range
+function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  "if from_line has CB, increment it and set all siblings to the same new state
+  let rate_first_line = s:get_rate(from_item)
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  let new_rate = min([rate_first_line + 100/(n-1)+1, 100])
+
+  call s:change_cb(a:from_line, a:to_line, new_rate)
+
+endfunction "}}}
+
 "Toggles checkbox between [ ] and [X] or creates one
 "in the lines of the given range
 function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
@@ -821,8 +882,6 @@ function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
     return
   endif
 
-  let parent_items_of_lines = []
-
   if from_item.cb == ''
 
     "if from_line has no CB, make a CB in every selected line
@@ -839,29 +898,20 @@ function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
       endif
     endfor
 
+    for parent_item in parent_items_of_lines
+      call s:update_state(parent_item)
+    endfor
+
   else
 
     "if from_line has CB, toggle it and set all siblings to the same new state
     let rate_first_line = s:get_rate(from_item)
     let new_rate = rate_first_line == 100 ? 0 : 100
 
-    for cur_ln in range(from_item.lnum, a:to_line)
-      let cur_item = s:get_item(cur_ln)
-      if cur_item.type != 0 && cur_item.cb != ''
-        call s:set_state_plus_children(cur_item, new_rate)
-        let cur_parent_item = s:get_parent(cur_item)
-        if index(parent_items_of_lines, cur_parent_item) == -1
-          call insert(parent_items_of_lines, cur_parent_item)
-        endif
-      endif
-    endfor
+    call s:change_cb(a:from_line, a:to_line, new_rate)
 
   endif
 
-  for parent_item in parent_items_of_lines
-    call s:update_state(parent_item)
-  endfor
-
 endfunction "}}}
 
 function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 2cc2c4e..6d150a4 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -351,6 +351,16 @@ gL<Space>               Remove checkboxes from all sibling list items.
                         :map <Leader><Space> <Plug>VimwikiRemoveSingleCB
                         :map <Leader><Space> <Plug>VimwikiRemoveCBInList
 <
+                        *vimwiki_gln* *vimwiki_glp*
+gln                     Increase the "done" status of a list checkbox, i.e.
+                        from [ ] to [.] to [o] etc. See |vimwiki-todo-lists|.
+glp                     Decrease the "done" status.
+                        To remap: >
+                        :nmap <M-+> <Plug>VimwikiIncrementListItem
+                        :vmap <M-+> <Plug>VimwikiIncrementListItem
+                        :nmap <M--> <Plug>VimwikiDecrementListItem
+                        :vmap <M--> <Plug>VimwikiDecrementListItem
+
                         *vimwiki_gll* *vimwiki_gLl*
 gll                     Increase the level of a list item.
 gLl                     Increase the level of a list item and all child items.
@@ -1542,7 +1552,7 @@ See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
 |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI|
 
 
-Use glr and gLr, if the numbers of a numbered list are mixed up. See
+Use glr and gLr if the numbers of a numbered list are mixed up. See
 |vimwiki_glr| and |vimwiki_gLr|.
 
 
@@ -1595,6 +1605,9 @@ child items (see also |g:vimwiki_listsyms|): >
     [O] -- 67-99%
     [X] -- 100%
 
+You can use |vimwiki_gln| and |vimwiki_glp| to change the "done" status of a
+checkbox without a childitem.
+
 It is possible to toggle several list items using visual mode. But note that
 instead of toggling every item individually, all items get checked if the
 first item is unchecked and all items get unchecked if the first item is
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index b3a0aa1..9cce366 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -289,6 +289,8 @@ command! -buffer -range -nargs=1 VimwikiListChangeSymbolI
 command! -buffer -nargs=1 VimwikiChangeSymbolInListTo
       \ call vimwiki#lst#change_marker_in_list(<f-args>)
 command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
+command! -buffer -range VimwikiIncrementListItem call vimwiki#lst#increment_cb(<line1>, <line2>)
+command! -buffer -range VimwikiDecrementListItem call vimwiki#lst#decrement_cb(<line1>, <line2>)
 command! -buffer -range -nargs=+ VimwikiListChangeLvl
       \ call vimwiki#lst#change_level(<line1>, <line2>, <f-args>)
 command! -buffer -range VimwikiRemoveSingleCB call vimwiki#lst#remove_cb(<line1>, <line2>)
@@ -440,6 +442,23 @@ nnoremap <silent><script><buffer>
 vnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 
+if !hasmapto('<Plug>VimwikiIncrementListItem')
+  nmap <silent><buffer> gln <Plug>VimwikiIncrementListItem
+  vmap <silent><buffer> gln <Plug>VimwikiIncrementListItem
+endif
+if !hasmapto('<Plug>VimwikiDecrementListItem')
+  nmap <silent><buffer> glp <Plug>VimwikiDecrementListItem
+  vmap <silent><buffer> glp <Plug>VimwikiDecrementListItem
+endif
+nnoremap <silent><script><buffer>
+      \ <Plug>VimwikiIncrementListItem :VimwikiIncrementListItem<CR>
+vnoremap <silent><script><buffer>
+      \ <Plug>VimwikiIncrementListItem :VimwikiIncrementListItem<CR>
+nnoremap <silent><script><buffer>
+      \ <Plug>VimwikiDecrementListItem :VimwikiDecrementListItem<CR>
+vnoremap <silent><script><buffer>
+      \ <Plug>VimwikiDecrementListItem :VimwikiDecrementListItem<CR>
+
 if !hasmapto('<Plug>VimwikiDecreaseLvlSingleItem', 'i')
   imap <silent><buffer> <C-D>
         \ <Plug>VimwikiDecreaseLvlSingleItem

From 4c940cd5bb4551a49757ebf5750380ebd5b0dddc Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 17 Feb 2018 21:30:01 +0100
Subject: [PATCH 056/108] Cherry-pick the changes from dev -- part6

---
 LICENSE                    | 22 ++++++++++++++++++++++
 autoload/vimwiki/base.vim  |  2 +-
 autoload/vimwiki/diary.vim |  2 +-
 doc/vimwiki.txt            | 32 +++++++++++++++++++++++---------
 4 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..cdf8546
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2008-2010 Maxim Kim
+              2013-2017 Daniel Schemala
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 14709a6..ee21672 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1129,7 +1129,7 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
 
       " remove the extension from the filename if exists, because non-vimwiki
       " markdown files usually include the extension in links
-      let lnk = substitute(lnk, vimwiki#vars#get_wikilocal('ext').'$', '', '')
+      let lnk = substitute(lnk, '\'.vimwiki#vars#get_wikilocal('ext').'$', '', '')
     endif
 
     let current_tab_page = tabpagenr()
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 253f11c..4b18c5e 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -65,7 +65,7 @@ fun! s:read_captions(files) "{{{
   let rx_header = vimwiki#vars#get_syntaxlocal('rxHeader')
   for fl in a:files
     " remove paths and extensions
-    let fl_key = fnamemodify(fl, ':t:r')
+    let fl_key = substitute(fnamemodify(fl, ':t'), vimwiki#vars#get_wikilocal('ext').'$', '', '')
 
     if filereadable(fl)
       for line in readfile(fl, '', s:vimwiki_max_scan_for_caption)
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 6d150a4..b685162 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -1229,14 +1229,9 @@ LaTeX code).
 Note: the highlighting in Vim is automatic. For the rendering in HTML, you
 have two alternative options:
 
-1. using the MathJax server for rendering (needs internet connection).
-Add to your HTML template the following line:
-
-<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
-
-2. installing MathJax locally (faster, no internet required). Choose a
-folder on your hard drive and save MathJax in it. Then add to your HTML
-template the following line:
+1. installing MathJax locally (Recommended: faster, no internet required).
+Choose a folder on your hard drive and save MathJax in it. Then add to your
+HTML template the following line:
 
 <script type="text/javascript" src="<mathjax_folder>/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
 
@@ -1251,6 +1246,11 @@ template folder. For instance, a sensible folder structure could be:
 
 In this case, <mathjax_folder> would be "../mathjax" (without quotes).
 
+2. Loading MathJax from a CDN-server (needs internet connection).
+Add to your HTML template the following line:
+
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/config/TeX-AMS-MML_HTMLorMML.js"></script>
+
 
 ------------------------------------------------------------------------------
 5.9. Blockquotes                                  *vimwiki-syntax-blockquotes*
@@ -2850,6 +2850,19 @@ Contributors and their Github usernames in roughly chronological order:
     - @wangzq
     - Jinzhou Zhang (@lotabout)
     - Michael Riley (@optik-aper)
+    - Irfan Sharif (@irfansharif)
+    - John Conroy (@jconroy77)
+    - Christian Rondeau (@christianrondeau)
+    - Alex Thorne (@thornecc)
+    - Shafqat Bhuiyan (@priomsrb)
+    - Bradley Cicenas (@bcicen)
+    - Michael Thessel (@MichaelThessel)
+    - Michael F. Schönitzer (@nudin)
+    - @sqlwwx
+    - Guilherme Salazar (@salazar)
+    - Daniel Trnka (@trnila)
+    - Yuchen Pei (@ycpei)
+    - @maqiv
 
 
 ==============================================================================
@@ -3097,10 +3110,11 @@ http://code.google.com/p/vimwiki/issues/list
 ==============================================================================
 16. License                                                  *vimwiki-license*
 
-The MIT Licence
+The MIT License
 http://www.opensource.org/licenses/mit-license.php
 
 Copyright (c) 2008-2010 Maxim Kim
+              2013-2017 Daniel Schemala
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 1e858b50cbeaf04c1292a68169ab440c7feafac5 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Mon, 19 Feb 2018 07:07:22 +0100
Subject: [PATCH 057/108] Cherry-pick the changes from dev -- part7

---
 autoload/vimwiki/html.vim  |  2 +
 autoload/vimwiki/lst.vim   | 92 +++++++++++++++++++++++---------------
 autoload/vimwiki/style.css |  7 +++
 autoload/vimwiki/vars.vim  | 10 ++++-
 doc/vimwiki.txt            | 27 +++++++++++
 ftplugin/vimwiki.vim       |  9 ++++
 6 files changed, 110 insertions(+), 37 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 075ab1f..d8fcd17 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -876,6 +876,8 @@ function! s:process_tag_list(line, lists) "{{{
       let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
       if completion == 0
         let st_tag = '<li class="done0">'
+      elseif completion == -1 && chk[1] == vimwiki#vars#get_global('listsym_rejected')
+        let st_tag = '<li class="rejected">'
       elseif completion > 0 && completion < n
         let completion = float2nr(round(completion / (n-1.0) * 3.0 + 0.5 ))
         let st_tag = '<li class="done'.completion.'">'
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 3832ba9..ca0afee 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -697,6 +697,9 @@ function! s:get_rate(item) "{{{
     return -1
   endif
   let state = a:item.cb
+  if state == vimwiki#vars#get_global('listsym_rejected')
+    return -1
+  endif
   let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
   return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 100/(n-1)
 endfunction "}}}
@@ -740,6 +743,8 @@ function! s:rate_to_state(rate) "{{{
     let state = listsyms_list[n-1]
   elseif a:rate == 0
     let state = listsyms_list[0]
+  elseif a:rate == -1
+    let state = vimwiki#vars#get_global('listsym_rejected')
   else
     let index = float2nr(ceil(a:rate/100.0*(n-2)))
     let state = listsyms_list[index]
@@ -764,8 +769,11 @@ function! s:update_state(item) "{{{
       break
     endif
     if child_item.cb != ''
-      let count_children_with_cb += 1
-      let sum_children_rate += s:get_rate(child_item)
+      let rate = s:get_rate(child_item)
+      if rate != -1
+        let count_children_with_cb += 1
+        let sum_children_rate += rate
+      endif
     endif
     let child_item = s:get_next_child_item(a:item, child_item)
   endwhile
@@ -840,6 +848,46 @@ function! s:change_cb(from_line, to_line, new_rate) "{{{
 
 endfunction "}}}
 
+"Toggles checkbox between two states in the lines of the given range,
+"creates chceckboxes if there aren't any.
+function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  if from_item.cb == ''
+
+    "if from_line has no CB, make a CB in every selected line
+    let parent_items_of_lines = []
+    for cur_ln in range(from_item.lnum, a:to_line)
+      let cur_item = s:get_item(cur_ln)
+      let success = s:create_cb(cur_item)
+
+      if success
+        let cur_parent_item = s:get_parent(cur_item)
+        if index(parent_items_of_lines, cur_parent_item) == -1
+          call insert(parent_items_of_lines, cur_parent_item)
+        endif
+      endif
+    endfor
+
+    for parent_item in parent_items_of_lines
+      call s:update_state(parent_item)
+    endfor
+
+  else
+
+    "if from_line has CB, toggle it and set all siblings to the same new state
+    let rate_first_line = s:get_rate(from_item)
+    let new_rate = rate_first_line == a:state1 ? a:state2 : a:state1
+
+    call s:change_cb(a:from_line, a:to_line, new_rate)
+
+  endif
+
+endfunction "}}}
+
 "Decrement checkbox between [ ] and [X]
 "in the lines of the given range
 function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
@@ -877,41 +925,13 @@ endfunction "}}}
 "Toggles checkbox between [ ] and [X] or creates one
 "in the lines of the given range
 function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  if from_item.cb == ''
-
-    "if from_line has no CB, make a CB in every selected line
-    let parent_items_of_lines = []
-    for cur_ln in range(from_item.lnum, a:to_line)
-      let cur_item = s:get_item(cur_ln)
-      let success = s:create_cb(cur_item)
-
-      if success
-        let cur_parent_item = s:get_parent(cur_item)
-        if index(parent_items_of_lines, cur_parent_item) == -1
-          call insert(parent_items_of_lines, cur_parent_item)
-        endif
-      endif
-    endfor
-
-    for parent_item in parent_items_of_lines
-      call s:update_state(parent_item)
-    endfor
-
-  else
-
-    "if from_line has CB, toggle it and set all siblings to the same new state
-    let rate_first_line = s:get_rate(from_item)
-    let new_rate = rate_first_line == 100 ? 0 : 100
-
-    call s:change_cb(a:from_line, a:to_line, new_rate)
-
-  endif
+  return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
+endfunction "}}}
 
+"Toggles checkbox between [ ] and [-] or creates one
+"in the lines of the given range
+function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
+  return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
 endfunction "}}}
 
 function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
diff --git a/autoload/vimwiki/style.css b/autoload/vimwiki/style.css
index da2518c..431d15b 100644
--- a/autoload/vimwiki/style.css
+++ b/autoload/vimwiki/style.css
@@ -27,6 +27,13 @@ del {text-decoration: line-through; color: #777777;}
 .tag {background-color: #eeeeee; font-family: monospace; padding: 2px;}
 
 /* classes for items of todo lists */
+.rejected {
+    /* list-style: none; */
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAACXBIWXMAAADFAAAAxQEdzbqoAAAAB3RJTUUH4QgEFhAtuWgv9wAAAPZQTFRFmpqam5iYnJaWnJeXnpSUn5OTopCQpoqKpouLp4iIqIiIrYCAt3V1vW1tv2xsmZmZmpeXnpKS/x4e/x8f/yAg/yIi/yQk/yUl/yYm/ygo/ykp/yws/zAw/zIy/zMz/zQ0/zU1/zY2/zw8/0BA/0ZG/0pK/1FR/1JS/1NT/1RU/1VV/1ZW/1dX/1pa/15e/19f/2Zm/2lp/21t/25u/3R0/3p6/4CA/4GB/4SE/4iI/46O/4+P/52d/6am/6ur/66u/7Oz/7S0/7e3/87O/9fX/9zc/93d/+Dg/+vr/+3t/+/v//Dw//Ly//X1//f3//n5//z8////gzaKowAAAA90Uk5T/Pz8/Pz8/Pz8/Pz8/f39ppQKWQAAAAFiS0dEEnu8bAAAAACuSURBVAhbPY9ZF4FQFEZPSKbIMmWep4gMGTKLkIv6/3/GPbfF97b3w17rA0kQOPgvAeHW6uJ6+5h7HqLdwowgOzejXRXBdx6UdSru216xuOMBHHNU0clTzeSUA6EhF8V8kqroluMiU6HKcuf4phGPr1o2q9kYZWwNq1qfRRmTaXpqsyjj17KkWCxKBUBgXWueHIyiAIg18gsse4KHkLF5IKIY10WQgv7fOy4ST34BRiopZ8WLNrgAAAAASUVORK5CYII=);
+    background-repeat: no-repeat;
+    background-position: 0 .2em;
+    padding-left: 1.5em;
+}
 .done0 {
     /* list-style: none; */
     background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==);
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 01b2263..2e704a7 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -49,6 +49,7 @@ function! s:populate_global_variables()
         \ 'list_ignore_newline': 1,
         \ 'text_ignore_newline': 1,
         \ 'listsyms': ' .oOX',
+        \ 'listsym_rejected': '-',
         \ 'map_prefix': '<Leader>w',
         \ 'menu': 'Vimwiki',
         \ 'table_auto_fmt': 1,
@@ -376,12 +377,19 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
   "the user can set the listsyms as string, but vimwiki needs a list
   let g:vimwiki_syntax_variables[a:syntax].listsyms_list =
         \ split(vimwiki#vars#get_global('listsyms'), '\zs')
+  if match(vimwiki#vars#get_global('listsyms'), vimwiki#vars#get_global('listsym_rejected')) != -1
+    echomsg 'Vimwiki Warning: the value of g:vimwiki_listsym_rejected ('''
+          \ . vimwiki#vars#get_global('listsym_rejected')
+          \ . ''') must not be a part of g:vimwiki_listsyms (''' .
+          \ . vimwiki#vars#get_global('listsyms') . ''')'
+  endif
   let g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB =
         \ '^\s*\%(\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\|\('
         \ .g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\)\s'
   let g:vimwiki_syntax_variables[a:syntax].rxListItem =
         \ g:vimwiki_syntax_variables[a:syntax].rxListItemWithoutCB
-        \ . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms').']\)\]\s\)\?'
+        \ . '\+\%(\[\(['.vimwiki#vars#get_global('listsyms')
+        \ . vimwiki#vars#get_global('listsym_rejected').']\)\]\s\)\?'
   if g:vimwiki_syntax_variables[a:syntax].recurring_bullets
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
           \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\['
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index b685162..7e62cba 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -455,6 +455,13 @@ gLI                     Change the symbol of the current list to
                         To remap: >
                         noremap glo :VimwikiChangeSymbolTo I)<CR>
                         noremap glO :VimwikiChangeSymbolInListTo I)<CR>
+<
+                        *vimwiki_glx*
+glx                     Toggle checkbox of a list item disabled/off.
+                        Maps to |:VimwikiToggleRejectedListItem|.
+                        See |vimwiki-todo-lists|.
+                        To remap: >
+                        :map <Leader>tx <Plug>VimwikiToggleRejectedListItem
 <
                         *vimwiki_gqq*  *vimwiki_gww*
 gqq                     Format table. If you made some changes to a table
@@ -656,6 +663,10 @@ Vimwiki file.
     Toggle checkbox of a list item on/off.
     See |vimwiki-todo-lists|.
 
+*:VimwikiToggleRejectedListItem*
+    Toggle checkbox of a list item disabled/off.
+    See |vimwiki-todo-lists|.
+
 *:VimwikiListChangeLevel* CMD
     Change the nesting level, or symbol, for a single-line list item.
     CMD may be ">>" or "<<" to change the indentation of the item, or
@@ -1617,6 +1628,9 @@ Use gl<Space> (see |vimwiki_gl<Space>|) to remove a single checkbox and
 gL<Space> (see |vimwiki_gL<Space>|) to remove all checkboxes of the list the
 cursor is in.
 
+You can mark an item as rejected ("won't do") with
+|vimwiki_glx|. A rejected item will not influence the status of its parents.
+
 
 ==============================================================================
 9. Tables                                                     *vimwiki-tables*
@@ -2341,6 +2355,19 @@ You can set it to some more fancy symbols like this:
    let g:vimwiki_listsyms = '✗○◐●✓'
 
 
+------------------------------------------------------------------------------
+*g:vimwiki_listsym_rejected*
+
+Character that is used to show that an item of a todo list will not be done.
+Default value is '-'.
+
+The character used here must not be part of |g:vimwiki_listsyms|.
+
+You can set it to a more fancy symbol like this:
+>
+   let g:vimwiki_listsym_rejected = '✗'
+
+
 ------------------------------------------------------------------------------
 *g:vimwiki_use_mouse*
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 9cce366..e2b5507 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -289,6 +289,7 @@ command! -buffer -range -nargs=1 VimwikiListChangeSymbolI
 command! -buffer -nargs=1 VimwikiChangeSymbolInListTo
       \ call vimwiki#lst#change_marker_in_list(<f-args>)
 command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
+command! -buffer -range VimwikiToggleRejectedListItem call vimwiki#lst#toggle_rejected_cb(<line1>, <line2>)
 command! -buffer -range VimwikiIncrementListItem call vimwiki#lst#increment_cb(<line1>, <line2>)
 command! -buffer -range VimwikiDecrementListItem call vimwiki#lst#decrement_cb(<line1>, <line2>)
 command! -buffer -range -nargs=+ VimwikiListChangeLvl
@@ -437,10 +438,18 @@ if !hasmapto('<Plug>VimwikiToggleListItem')
     vmap <silent><buffer> <C-@> <Plug>VimwikiToggleListItem
   endif
 endif
+if !hasmapto('<Plug>VimwikiToggleRejectedListItem')
+  nmap <silent><buffer> glx <Plug>VimwikiToggleRejectedListItem
+  vmap <silent><buffer> glx <Plug>VimwikiToggleRejectedListItem
+endif
 nnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 vnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
+nnoremap <silent><script><buffer>
+      \ <Plug>VimwikiToggleRejectedListItem :VimwikiToggleRejectedListItem<CR>
+vnoremap <silent><script><buffer>
+      \ <Plug>VimwikiToggleRejectedListItem :VimwikiToggleRejectedListItem<CR>
 
 if !hasmapto('<Plug>VimwikiIncrementListItem')
   nmap <silent><buffer> gln <Plug>VimwikiIncrementListItem

From 2757a7826ad3b3a2e64dc03e9ab4422175c31199 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Mon, 19 Feb 2018 07:44:19 +0100
Subject: [PATCH 058/108] Cherry-pick the changes from dev -- part8

---
 autoload/vimwiki/base.vim          | 58 ++++++++++++++++++------------
 autoload/vimwiki/diary.vim         | 13 ++++---
 autoload/vimwiki/markdown_base.vim | 12 +++++--
 3 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index ee21672..39ae7ff 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -8,6 +8,13 @@ if exists("g:loaded_vimwiki_auto") || &cp
 endif
 let g:loaded_vimwiki_auto = 1
 
+" s:safesubstitute
+function! s:safesubstitute(text, search, replace, mode) "{{{
+  " Substitute regexp but do not interpret replace
+  let escaped = escape(a:replace, '\&')
+  return substitute(a:text, a:search, escaped, a:mode)
+endfunction " }}}
+
 " s:vimwiki_get_known_syntaxes
 function! s:vimwiki_get_known_syntaxes() " {{{
   " Getting all syntaxes that different wikis could have
@@ -312,7 +319,8 @@ function! vimwiki#base#generate_links() "{{{
     let abs_filepath = vimwiki#path#abs_path_of_link(link)
     if !s:is_diary_file(abs_filepath)
       call add(lines, bullet.
-            \ substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', '\='."'".link."'", ''))
+            \ s:safesubstitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
+            \ '__LinkUrl__', link, ''))
     endif
   endfor
 
@@ -525,15 +533,15 @@ function! s:jump_to_anchor(anchor) "{{{
 
   for segment in segments
 
-    let anchor_header = substitute(
+    let anchor_header = s:safesubstitute(
           \ vimwiki#vars#get_syntaxlocal('header_match'),
-          \ '__Header__', "\\='".segment."'", '')
-    let anchor_bold = substitute(
+          \ '__Header__', segment, '')
+    let anchor_bold = s:safesubstitute(
           \ vimwiki#vars#get_syntaxlocal('bold_match'),
-          \ '__Text__', "\\='".segment."'", '')
-    let anchor_tag = substitute(
+          \ '__Text__', segment, '')
+    let anchor_tag = s:safesubstitute(
           \ vimwiki#vars#get_syntaxlocal('tag_match'),
-          \ '__Tag__', "\\='".segment."'", '')
+          \ '__Tag__', segment, '')
 
     if         !search(anchor_tag, 'Wc')
           \ && !search(anchor_header, 'Wc')
@@ -690,7 +698,7 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
   " then
   " [[test*file]]...
   " you'll have E77: Too many file names
-  let fname = escape(a:filename, '% *|#')
+  let fname = escape(a:filename, '% *|#`')
   let dir = fnamemodify(a:filename, ":p:h")
 
   let ok = vimwiki#path#mkdir(dir, 1)
@@ -1032,8 +1040,8 @@ function! vimwiki#base#update_listing_in_buffer(strings, start_header,
 
   " write new listing
   let new_header = whitespaces_in_first_line
-        \ . substitute(vimwiki#vars#get_syntaxlocal('rxH1_Template'),
-        \ '__Header__', '\='."'".a:start_header."'", '')
+        \ . s:safesubstitute(vimwiki#vars#get_syntaxlocal('rxH1_Template'),
+        \ '__Header__', a:start_header, '')
   call append(start_lnum - 1, new_header)
   let start_lnum += 1
   let lines_diff += 1 + len(a:strings)
@@ -1182,7 +1190,13 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
   endif
 
   if a:0
-    let cmd = 'tabedit'
+    if a:1 == 1
+      let cmd = 'tabedit'
+    elseif a:1 == 2
+      let cmd = 'split'
+    elseif a:1 == 3
+      let cmd = 'vsplit'
+    endif
   else
     let cmd = 'edit'
   endif
@@ -1682,9 +1696,9 @@ function! vimwiki#base#table_of_contents(create)
   for [lvl, link, desc] in headers
     let esc_link = substitute(link, "'", "''", 'g')
     let esc_desc = substitute(desc, "'", "''", 'g')
-    let link = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__',
-          \ '\='."'".'#'.esc_link."'", '')
-    let link = substitute(link, '__LinkDescription__', '\='."'".esc_desc."'", '')
+    let link = s:safesubstitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__',
+          \ '#'.esc_link, '')
+    let link = s:safesubstitute(link, '__LinkDescription__', esc_desc, '')
     call add(lines, startindent.repeat(indentstring, lvl-1).bullet.link)
   endfor
 
@@ -1705,13 +1719,13 @@ endfunction
 function! vimwiki#base#apply_template(template, rxUrl, rxDesc, rxStyle) "{{{
   let lnk = a:template
   if a:rxUrl != ""
-    let lnk = substitute(lnk, '__LinkUrl__', '\='."'".a:rxUrl."'", 'g')
+    let lnk = s:safesubstitute(lnk, '__LinkUrl__', a:rxUrl, 'g')
   endif
   if a:rxDesc != ""
-    let lnk = substitute(lnk, '__LinkDescription__', '\='."'".a:rxDesc."'", 'g')
+    let lnk = s:safesubstitute(lnk, '__LinkDescription__', a:rxDesc, 'g')
   endif
   if a:rxStyle != ""
-    let lnk = substitute(lnk, '__LinkStyle__', '\='."'".a:rxStyle."'", 'g')
+    let lnk = s:safesubstitute(lnk, '__LinkStyle__', a:rxStyle, 'g')
   endif
   return lnk
 endfunction " }}}
@@ -1750,8 +1764,8 @@ function! vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template) " {{{
   if descr == ""
     let descr = s:clean_url(url)
   endif
-  let lnk = substitute(template, '__LinkDescription__', '\="'.descr.'"', '')
-  let lnk = substitute(lnk, '__LinkUrl__', '\="'.url.'"', '')
+  let lnk = s:safesubstitute(template, '__LinkDescription__', descr, '')
+  let lnk = s:safesubstitute(lnk, '__LinkUrl__', url, '')
   return lnk
 endfunction " }}}
 
@@ -1759,7 +1773,7 @@ endfunction " }}}
 function! vimwiki#base#normalize_imagelink_helper(str, rxUrl, rxDesc, rxStyle, template) "{{{
   let lnk = vimwiki#base#normalize_link_helper(a:str, a:rxUrl, a:rxDesc, a:template)
   let style = matchstr(a:str, a:rxStyle)
-  let lnk = substitute(lnk, '__LinkStyle__', '\="'.style.'"', '')
+  let lnk = s:safesubstitute(lnk, '__LinkStyle__', style, '')
   return lnk
 endfunction " }}}
 
@@ -1851,8 +1865,8 @@ function! s:normalize_link_syntax_v() " {{{
     if s:is_diary_file(expand("%:p"))
       let sub = s:normalize_link_in_diary(@")
     else
-      let sub = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
-            \ '__LinkUrl__', '\=' . "'" . @" . "'", '')
+      let sub = s:safesubstitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
+            \ '__LinkUrl__', @", '')
     endif
 
     " Put substitution in register " and change text
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 4b18c5e..e02e94b 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -174,10 +174,15 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
 
   call vimwiki#path#mkdir(vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx))
 
-  if a:0 && a:1 == 1
-    let cmd = 'tabedit'
-  else
-    let cmd = 'edit'
+  let cmd = 'edit'
+  if a:0
+    if a:1 == 1
+      let cmd = 'tabedit'
+    elseif a:1 == 2
+      let cmd = 'split'
+    elseif a:1 == 3
+      let cmd = 'vsplit'
+    endif
   endif
   if a:0>1
     let link = 'diary:'.a:2
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index f55be2d..fa14b62 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -6,6 +6,13 @@
 
 " MISC helper functions {{{
 
+" s:safesubstitute
+function! s:safesubstitute(text, search, replace, mode) "{{{
+  " Substitute regexp but do not interpret replace
+  let escaped = escape(a:replace, '\&')
+  return substitute(a:text, a:search, escaped, a:mode)
+endfunction " }}}
+
 " vimwiki#markdown_base#scan_reflinks
 function! vimwiki#markdown_base#scan_reflinks() " {{{
   let mkd_refs = {}
@@ -117,8 +124,9 @@ function! s:normalize_link_syntax_v() " {{{
   try
     norm! gvy
     let visual_selection = @"
-    let link = substitute(vimwiki#vars#get_syntaxlocal('Weblink1Template'), '__LinkUrl__', '\='."'".visual_selection."'", '')
-    let link = substitute(link, '__LinkDescription__', '\='."'".visual_selection."'", '')
+    let link = s:safesubstitute(vimwiki#vars#get_syntaxlocal('Weblink1Template'),
+          \ '__LinkUrl__', visual_selection, '')
+    let link = s:safesubstitute(link, '__LinkDescription__', visual_selection, '')
 
     call setreg('"', link, 'v')
 

From 46a5be9b3bf65ed6f0b493921d570f751f4f9633 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 20 Feb 2018 17:42:13 +0100
Subject: [PATCH 059/108] Fix regression: some variables are global, not
 syntax-local

Ref #256
---
 autoload/vimwiki/base.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 39ae7ff..8207cf1 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1093,8 +1093,8 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
         \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'))
   " try WikiIncl
   if lnk == ""
-    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiIncl')),
-          \ vimwiki#vars#get_syntaxlocal('rxWikiInclMatchUrl'))
+    let lnk = matchstr(vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl')),
+          \ vimwiki#vars#get_global('rxWikiInclMatchUrl'))
   endif
   " try Weblink
   if lnk == ""

From b016eab91a0f3854027834937a9317f8c5aef123 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 21 Feb 2018 07:11:51 +0100
Subject: [PATCH 060/108] Set 'tw' to 99 in all source files. We're not in the
 middle ages anymore.

---
 autoload/vimwiki/base.vim          | 2 +-
 autoload/vimwiki/diary.vim         | 2 +-
 autoload/vimwiki/html.vim          | 2 +-
 autoload/vimwiki/lst.vim           | 2 +-
 autoload/vimwiki/markdown_base.vim | 2 +-
 autoload/vimwiki/path.vim          | 2 +-
 autoload/vimwiki/tags.vim          | 2 +-
 autoload/vimwiki/tbl.vim           | 2 +-
 autoload/vimwiki/u.vim             | 2 +-
 ftplugin/vimwiki.vim               | 2 +-
 plugin/vimwiki.vim                 | 2 +-
 syntax/vimwiki.vim                 | 2 +-
 syntax/vimwiki_default.vim         | 2 +-
 syntax/vimwiki_markdown.vim        | 2 +-
 syntax/vimwiki_media.vim           | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 8207cf1..bf4ab4c 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Basic functionality
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index e02e94b..6ee81c7 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Handle diary notes
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 6f5e803..11261c7 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Export to HTML
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 6671b0d..390e542 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Everything concerning lists and checkboxes
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index fa14b62..f4b61a1 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Link functions for markdown syntax
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/autoload/vimwiki/path.vim b/autoload/vimwiki/path.vim
index 263466c..e7f78fb 100644
--- a/autoload/vimwiki/path.vim
+++ b/autoload/vimwiki/path.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Path manipulation functions
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index 490b47d..dd03ee4 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 
 
diff --git a/autoload/vimwiki/tbl.vim b/autoload/vimwiki/tbl.vim
index d9c7134..53ea998 100644
--- a/autoload/vimwiki/tbl.vim
+++ b/autoload/vimwiki/tbl.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Tables
 " | Easily | manageable | text  | tables | !       |
diff --git a/autoload/vimwiki/u.vim b/autoload/vimwiki/u.vim
index 009bf9d..c0142f2 100644
--- a/autoload/vimwiki/u.vim
+++ b/autoload/vimwiki/u.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Utility functions
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index e2b5507..8c0ae90 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki filetype plugin file
 " Home: https://github.com/vimwiki/vimwiki/
 
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 8d1ffaa..af43f83 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki plugin file
 " Home: https://github.com/vimwiki/vimwiki/
 " GetLatestVimScripts: 2226 1 :AutoInstall: vimwiki
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 43e769e..66e3610 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki syntax file
 " Home: https://github.com/vimwiki/vimwiki/
 
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
index 93ccc92..99bead3 100644
--- a/syntax/vimwiki_default.vim
+++ b/syntax/vimwiki_default.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki syntax file
 " Desc: Defines default syntax
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index d181b95..36e9279 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki syntax file
 " Desc: Defines markdown syntax
 " Home: https://github.com/vimwiki/vimwiki/
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index dfdc9d9..15d8b60 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=79
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
 " Vimwiki syntax file
 " Desc: Defines mediaWiki syntax
 " Home: https://github.com/vimwiki/vimwiki/

From 5a00028e6a22609940839d8aba7a3824e4106007 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 22 Feb 2018 20:55:10 +0100
Subject: [PATCH 061/108] Don't exit if there are no registered wikis

Vimwiki can handle that.
Ref #440
---
 autoload/vimwiki/base.vim | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index bf4ab4c..c640773 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1176,11 +1176,6 @@ endfunction " }}}
 
 " vimwiki#base#goto_index
 function! vimwiki#base#goto_index(wnum, ...) "{{{
-  if a:wnum > vimwiki#vars#number_of_wikis()
-    echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in your Vimwiki settings!'
-    return
-  endif
-
   " usually a:wnum is greater then 0 but with the following command it is == 0:
   " vim -n -c ":VimwikiIndex"
   if a:wnum > 0

From 02e8fb3108cce46f19adb15c939e43b82a3da322 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 23 Feb 2018 17:39:50 +0100
Subject: [PATCH 062/108] Fix: register a default wiki if the user hasn't

Ref #440
Ref #441
---
 autoload/vimwiki/vars.vim | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 2e704a7..7946f68 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -206,13 +206,22 @@ function! s:populate_wikilocal_options()
 
   let g:vimwiki_wikilocal_vars = []
 
+  let default_wiki_settings = {}
+  for key in keys(default_values)
+    if exists('g:vimwiki_'.key)
+      let default_wiki_settings[key] = g:vimwiki_{key}
+    else
+      let default_wiki_settings[key] = default_values[key]
+    endif
+  endfor
+
   " set the wiki-local variables according to g:vimwiki_list (or the default settings)
   if exists('g:vimwiki_list')
-    for users_options in g:vimwiki_list
+    for users_wiki_settings in g:vimwiki_list
       let new_wiki_settings = {}
       for key in keys(default_values)
-        if has_key(users_options, key)
-          let new_wiki_settings[key] = users_options[key]
+        if has_key(users_wiki_settings, key)
+          let new_wiki_settings[key] = users_wiki_settings[key]
         elseif exists('g:vimwiki_'.key)
           let new_wiki_settings[key] = g:vimwiki_{key}
         else
@@ -224,19 +233,17 @@ function! s:populate_wikilocal_options()
 
       call add(g:vimwiki_wikilocal_vars, new_wiki_settings)
     endfor
+  else
+    " if the user hasn't registered any wiki, we register one wiki using the default values
+    let new_wiki_settings = deepcopy(default_wiki_settings)
+    let new_wiki_settings.is_temporary_wiki = 0
+    call add(g:vimwiki_wikilocal_vars, new_wiki_settings)
   endif
 
   " default values for temporary wikis
-  let temporary_options_dict = {}
-  for key in keys(default_values)
-    if exists('g:vimwiki_'.key)
-      let temporary_options_dict[key] = g:vimwiki_{key}
-    else
-      let temporary_options_dict[key] = default_values[key]
-    endif
-  endfor
-  let temporary_options_dict.is_temporary_wiki = 1
-  call add(g:vimwiki_wikilocal_vars, temporary_options_dict)
+  let temporary_wiki_settings = deepcopy(default_wiki_settings)
+  let temporary_wiki_settings.is_temporary_wiki = 1
+  call add(g:vimwiki_wikilocal_vars, temporary_wiki_settings)
 
   call s:validate_settings()
 endfunction

From 4bacbe00005f23d72d247fdde3a9e857d690b44b Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Mon, 26 Feb 2018 07:20:14 +0100
Subject: [PATCH 063/108] Force vimwiki filetype

Else, Vim decides the filetype according to the file extension.
Ref #440
---
 plugin/vimwiki.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index af43f83..8fe5f93 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -84,7 +84,7 @@ function! s:setup_buffer_enter() "{{{
     return
   endif
 
-  if &filetype == ''
+  if &filetype != 'vimwiki'
     setfiletype vimwiki
   endif
 

From 8009e5c7cf9d7dce133fdeb7cfa6cc4651580204 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 16 Mar 2018 21:39:24 +0100
Subject: [PATCH 064/108] Handle all combinations of 'autowriteall' and
 'hidden'

Ref #445
---
 autoload/vimwiki/base.vim | 26 +++++++++++++++-----------
 doc/vimwiki.txt           |  8 ++++++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index c640773..6452f20 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -690,14 +690,6 @@ endfunction "}}}
 
 " vimwiki#base#edit_file
 function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
-  " XXX: Should we allow * in filenames!?
-  " Maxim: It is allowed, escaping here is for vim to be able to open files
-  " which have that symbols.
-  " Try to remove * from escaping and open&save :
-  " [[testBLAfile]]...
-  " then
-  " [[test*file]]...
-  " you'll have E77: Too many file names
   let fname = escape(a:filename, '% *|#`')
   let dir = fnamemodify(a:filename, ":p:h")
 
@@ -709,12 +701,24 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
     return
   endif
 
-  " check if the file we want to open is already the current file
+  " Check if the file we want to open is already the current file
   " which happens if we jump to an achor in the current file.
   " This hack is necessary because apparently Vim messes up the result of
   " getpos() directly after this command. Strange.
   if !(a:command ==# ':e ' && vimwiki#path#is_equal(a:filename, expand('%:p')))
-    execute a:command.' '.fname
+    try
+      if &autowriteall && !&hidden  " in this case, the file is saved before switching to the
+        " new buffer. This causes Vim to show two messages in the command line which triggers
+        " the annoying hit-enter prompt. Solution: show no messages at all.
+        silent execute a:command fname
+      else
+        execute a:command fname
+      endif
+    catch /E37:/
+      echomsg 'Vimwiki: The current file is modified. Hint: Take a look at'
+            \ ''':h g:vimwiki_autowriteall'' to see how to save automatically.'
+      return
+    endtry
 
     " If the opened file was not already loaded by Vim, an autocommand is
     " triggered at this point
@@ -1166,7 +1170,7 @@ function! vimwiki#base#go_back_link() "{{{
   let prev_link = vimwiki#vars#get_bufferlocal('prev_link')
   if !empty(prev_link)
     " go back to saved wiki link
-    execute ":e ".substitute(prev_link[0], '\s', '\\\0', 'g')
+    call vimwiki#base#edit_file(':e ', prev_link[0], '')
     call setpos('.', prev_link[1])
   else
     " maybe we came here by jumping to a tag -> pop from the tag stack
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 7e62cba..d0c432b 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -2731,8 +2731,12 @@ Default: 2
 ------------------------------------------------------------------------------
 *g:vimwiki_autowriteall*
 
-In Vim 'autowriteall' is a global setting. With g:vimwiki_autowriteall Vimwiki
-makes it local to its buffers.
+Automatically save a modified wiki buffer when switching wiki pages. Has the
+same effect like setting the Vim option 'autowriteall', but it works for wiki
+files only, while the Vim option is global.
+Hint: if you're just annoyed that you have to save files manually to switch
+wiki pages, consider setting the Vim option 'hidden' which makes that modified
+files don't need to be saved.
 
 Value           Description~
 0               autowriteall is off

From 16b9e45b03baa377cee807f2bef7d97682e8bad6 Mon Sep 17 00:00:00 2001
From: beuerle <beuerle@users.noreply.github.com>
Date: Wed, 7 Mar 2018 16:59:49 +0100
Subject: [PATCH 065/108] fix diary list, indent according to list_margin

The list of diary entries now is not indented according to the vim
`shiftwidth` setting, but gets the indentation from list_margin (as is
the case for `vimwiki#base#generate_links`).
---
 autoload/vimwiki/diary.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 6ee81c7..7b0de30 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -143,11 +143,11 @@ function! s:format_diary() "{{{
         if empty(cap)
           let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', fl, '')
           let entry = substitute(entry, '__LinkDescription__', cap, '')
-          call add(result, repeat(' ', &sw).'* '.entry)
+          call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
         else
           let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__', fl, '')
           let entry = substitute(entry, '__LinkDescription__', cap, '')
-          call add(result, repeat(' ', &sw).'* '.entry)
+          call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
         endif
       endfor
 

From 52f3bf7c3bda9479e99dace1f8d86b965b9ba48f Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sun, 25 Mar 2018 21:51:08 +0200
Subject: [PATCH 066/108] Don't throw errors when the user presses 123\ww

This reverts commit 5a00028e6a22609940839d8aba7a3824e4106007.
---
 autoload/vimwiki/base.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 6452f20..b7a1855 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1180,6 +1180,11 @@ endfunction " }}}
 
 " vimwiki#base#goto_index
 function! vimwiki#base#goto_index(wnum, ...) "{{{
+  if a:wnum > vimwiki#vars#number_of_wikis()
+    echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in your Vimwiki settings!'
+    return
+  endif
+
   " usually a:wnum is greater then 0 but with the following command it is == 0:
   " vim -n -c ":VimwikiIndex"
   if a:wnum > 0

From 1c4a9bb1afb4ac4336ef33a184d9847507762011 Mon Sep 17 00:00:00 2001
From: Silvio Ricardo Cordeiro <silvioricardoc@gmail.com>
Date: Sun, 1 Apr 2018 21:45:15 +0200
Subject: [PATCH 067/108] HTML comments and better TODO

* Allow HTML-style comment syntax

Allow <!-- HTML comments --> in vimwiki's highlight for markdown.

* Avoid matching "TODO" on word boundaries

Do not match e.g. "xTODO:" as if it were "TODO:".
This also lifts the requirement of ":" after these keywords
(it is more flexible to just require a word boundary regardless of what).
---
 autoload/vimwiki/vars.vim   | 2 +-
 syntax/vimwiki.vim          | 2 +-
 syntax/vimwiki_markdown.vim | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 7946f68..1a9968f 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -164,7 +164,7 @@ function! s:populate_global_variables()
   let g:vimwiki_global_vars.rxWikiInclSuffix1 = g:vimwiki_global_vars.rxWikiInclArgs.
         \ g:vimwiki_global_vars.rxWikiInclSuffix
 
-  let g:vimwiki_global_vars.rxTodo = '\C\%(TODO:\|DONE:\|STARTED:\|FIXME:\|FIXED:\|XXX:\)'
+  let g:vimwiki_global_vars.rxTodo = '\C\<\%(TODO\|DONE\|STARTED\|FIXME\|FIXED\|XXX\)\>'
 
   " default colors when headers of different levels are highlighted differently
   " not making it yet another option; needed by ColorScheme autocommand
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 66e3610..9d8ba16 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -295,7 +295,7 @@ if vimwiki#vars#get_global('valid_html_tags') != ''
   execute 'syntax match VimwikiItalic #\c<i>.\{-}</i># contains=VimwikiHTMLTag'
   execute 'syntax match VimwikiUnderline #\c<u>.\{-}</u># contains=VimwikiHTMLTag'
 
-  execute 'syntax match VimwikiComment /'.vimwiki#vars#get_syntaxlocal('rxComment').'/ contains=@Spell'
+  execute 'syntax match VimwikiComment /'.vimwiki#vars#get_syntaxlocal('rxComment').'/ contains=@Spell,VimwikiTodo'
 endif
 
 " tags
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 36e9279..4242f82 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -87,7 +87,7 @@ let s:markdown_syntax.rxPreEnd = '```'
 let s:markdown_syntax.rxMathStart = '\$\$'
 let s:markdown_syntax.rxMathEnd = '\$\$'
 
-let s:markdown_syntax.rxComment = '^\s*%%.*$'
+let s:markdown_syntax.rxComment = '^\s*%%.*$\|<!--[^>]*-->'
 let s:markdown_syntax.rxTags = '\%(^\|\s\)\@<=:\%([^:[:space:]]\+:\)\+\%(\s\|$\)\@='
 
 let s:markdown_syntax.header_search = '^\s*\(#\{1,6}\)\([^#].*\)$'

From a2a9f2e6caa62bab5ecbe67a1b57c414969a9011 Mon Sep 17 00:00:00 2001
From: blyoa <blyoa@users.noreply.github.com>
Date: Tue, 3 Apr 2018 04:34:21 +0900
Subject: [PATCH 068/108] Fix path resolution of diary notes (#442)

---
 autoload/vimwiki/base.vim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index b7a1855..fc5258e 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -253,7 +253,12 @@ endfunction "}}}
 
 " vimwiki#base#open_link
 function! vimwiki#base#open_link(cmd, link, ...) "{{{
-  let link_infos = vimwiki#base#resolve_link(a:link)
+  let link_infos = {}
+  if a:0
+    let link_infos = vimwiki#base#resolve_link(a:link, a:1)
+  else
+    let link_infos = vimwiki#base#resolve_link(a:link)
+  endif
 
   if link_infos.filename == ''
     echomsg 'Vimwiki Error: Unable to resolve link!'

From 13271541a64629942f13704ae98dd4d580fe0e33 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 3 Apr 2018 19:45:19 +0200
Subject: [PATCH 069/108] Highlight done and rejected list item the same way

---
 autoload/vimwiki/vars.vim | 10 ++++++----
 syntax/vimwiki.vim        |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 1a9968f..b1836a2 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -399,14 +399,16 @@ function! vimwiki#vars#populate_syntax_vars(syntax)
         \ . vimwiki#vars#get_global('listsym_rejected').']\)\]\s\)\?'
   if g:vimwiki_syntax_variables[a:syntax].recurring_bullets
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
-          \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\['
-          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1].'\]\s.*\%(\n\%(\1\%('
+          \ '^\('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\)\s\+\[['
+          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1]
+          \ . vimwiki#vars#get_global('listsym_rejected') . ']\]\s.*\%(\n\%(\1\%('
           \ .g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\).*\|^$\|\s.*\)\)*'
   else
     let g:vimwiki_syntax_variables[a:syntax].rxListItemAndChildren =
           \ '^\(\s*\)\%('.g:vimwiki_syntax_variables[a:syntax].rxListBullet.'\|'
-          \ . g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\['
-          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1].'\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
+          \ . g:vimwiki_syntax_variables[a:syntax].rxListNumber.'\)\s\+\[['
+          \ . g:vimwiki_syntax_variables[a:syntax].listsyms_list[-1]
+          \ . vimwiki#vars#get_global('listsym_rejected') . ']\]\s.*\%(\n\%(\1\s.*\|^$\)\)*'
   endif
 
   " 0. URL : free-standing links: keep URL UR(L) strip trailing punct: URL; URL) UR(L))
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 9d8ba16..69b83c5 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -236,10 +236,13 @@ execute 'syntax match VimwikiListTodo /'.vimwiki#vars#get_syntaxlocal('rxListIte
 
 if vimwiki#vars#get_global('hl_cb_checked') == 1
   execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB')
-        \ .'\s*\['.vimwiki#vars#get_syntaxlocal('listsyms_list')[-1]
-        \ .'\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+        \ . '\s*\[['.vimwiki#vars#get_syntaxlocal('listsyms_list')[-1]
+        \ . vimwiki#vars#get_global('listsym_rejected')
+        \ . ']\]\s.*$/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 elseif vimwiki#vars#get_global('hl_cb_checked') == 2
-  execute 'syntax match VimwikiCheckBoxDone /'.vimwiki#vars#get_syntaxlocal('rxListItemAndChildren').'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
+  execute 'syntax match VimwikiCheckBoxDone /'
+        \ . vimwiki#vars#get_syntaxlocal('rxListItemAndChildren')
+        \ .'/ contains=VimwikiNoExistsLink,VimwikiLink,@Spell'
 endif
 
 

From 53745e89e000373db022070be00278b2a9bf241b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 4 Apr 2018 03:00:55 +0200
Subject: [PATCH 070/108] Fix newlineformat (issue #465)

The file contained carriage return characters leading to issues on some
systems. Removing them all should solve this.
---
 autoload/vimwiki/lst.vim | 3312 +++++++++++++++++++-------------------
 1 file changed, 1656 insertions(+), 1656 deletions(-)

diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 94fe074..6cfe758 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1,1656 +1,1656 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
-" Vimwiki autoload plugin file
-" Desc: Everything concerning lists and checkboxes
-" Home: https://github.com/vimwiki/vimwiki/
-
-if exists("g:loaded_vimwiki_list_auto") || &cp
-  finish
-endif
-let g:loaded_vimwiki_list_auto = 1
-
-"incrementation functions for the various kinds of numbers {{{
-
-function! s:increment_1(value) "{{{
-  return eval(a:value) + 1
-endfunction "}}}
-
-function! s:increment_A(value) "{{{
-  let list_of_chars = split(a:value, '.\zs')
-  let done = 0
-  for idx in reverse(range(len(list_of_chars)))
-    let cur_num = char2nr(list_of_chars[idx])
-    if cur_num < 90
-      let list_of_chars[idx] = nr2char(cur_num + 1)
-      let done = 1
-      break
-    else
-      let list_of_chars[idx] = 'A'
-    endif
-  endfor
-  if !done
-    call insert(list_of_chars, 'A')
-  endif
-  return join(list_of_chars, '')
-endfunction "}}}
-
-function! s:increment_a(value) "{{{
-  let list_of_chars = split(a:value, '.\zs')
-  let done = 0
-  for idx in reverse(range(len(list_of_chars)))
-    let cur_num = char2nr(list_of_chars[idx])
-    if cur_num < 122
-      let list_of_chars[idx] = nr2char(cur_num + 1)
-      let done = 1
-      break
-    else
-      let list_of_chars[idx] = 'a'
-    endif
-  endfor
-  if !done
-    call insert(list_of_chars, 'a')
-  endif
-  return join(list_of_chars, '')
-endfunction "}}}
-
-function! s:increment_I(value) "{{{
-  let subst_list = [ ['XLVIII$', 'IL'], ['VIII$', 'IX'], ['III$', 'IV'],
-        \ ['DCCCXCIX$', 'CM'], ['CCCXCIX$', 'CD'], ['LXXXIX$', 'XC'],
-        \ ['XXXIX$', 'XL'], ['\(I\{1,2\}\)$', '\1I'], ['CDXCIX$', 'D'],
-        \ ['CMXCIX$', 'M'], ['XCIX$', 'C'], ['I\([VXLCDM]\)$', '\1'],
-        \ ['\([VXLCDM]\)$', '\1I'] ]
-  for [regex, subst] in subst_list
-    if a:value =~# regex
-      return substitute(a:value, regex, subst, '')
-    endif
-  endfor
-  return ''
-endfunction "}}}
-
-function! s:increment_i(value) "{{{
-  let subst_list = [ ['xlviii$', 'il'], ['viii$', 'ix'], ['iii$', 'iv'],
-        \ ['dcccxcix$', 'cm'], ['cccxcix$', 'cd'], ['lxxxix$', 'xc'],
-        \ ['xxxix$', 'xl'], ['\(i\{1,2\}\)$', '\1i'], ['cdxcix$', 'd'],
-        \ ['cmxcix$', 'm'], ['xcix$', 'c'], ['i\([vxlcdm]\)$', '\1'],
-        \ ['\([vxlcdm]\)$', '\1i'] ]
-  for [regex, subst] in subst_list
-    if a:value =~# regex
-      return substitute(a:value, regex, subst, '')
-    endif
-  endfor
-  return ''
-endfunction "}}}
-
-"incrementation functions for the various kinds of numbers }}}
-
-"utility functions {{{
-
-function! s:substitute_rx_in_line(lnum, pattern, new_string) "{{{
-  call setline(a:lnum, substitute(getline(a:lnum), a:pattern, a:new_string,
-        \ ''))
-endfunction "}}}
-
-function! s:substitute_string_in_line(lnum, old_string, new_string) "{{{
-  call s:substitute_rx_in_line(a:lnum, vimwiki#u#escape(a:old_string),
-        \ a:new_string)
-endfunction "}}}
-
-function! s:first_char(string) "{{{
-  return matchstr(a:string, '^.')
-endfunction "}}}
-
-if exists("*strdisplaywidth") "{{{
-  function! s:string_length(str)
-    return strdisplaywidth(a:str)
-  endfunction
-else
-  function! s:string_length(str)
-    return strlen(substitute(a:str, '.', 'x', 'g'))
-  endfunction
-endif "}}}
-
-function! vimwiki#lst#default_symbol() "{{{
-  return vimwiki#vars#get_syntaxlocal('list_markers')[0]
-endfunction "}}}
-
-function! vimwiki#lst#get_list_margin() "{{{
-  let list_margin = vimwiki#vars#get_wikilocal('list_margin')
-  if list_margin < 0
-    return &sw
-  else
-    return list_margin
-  endif
-endfunction "}}}
-
-"Returns: the column where the text of a line starts (possible list item
-"markers and checkboxes are skipped)
-function! s:text_begin(lnum) "{{{
-  return s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem')))
-endfunction "}}}
-
-"Returns: 2 if there is a marker and text
-" 1 for a marker and no text
-" 0 for no marker at all (empty line or only text)
-function! s:line_has_marker(lnum) "{{{
-  if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*$'
-    return 1
-  elseif getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*\S'
-    return 2
-  else
-    return 0
-  endif
-endfunction "}}}
-
-"utility functions }}}
-
-"get properties of an item {{{
-
-"Returns: the mainly used data structure in this file
-"An item represents a single list item and is a dictionary with the keys
-"lnum - the line number of the list item
-"type - 1 for bulleted item, 2 for numbered item, 0 for a regular line
-"mrkr - the concrete marker, e.g. '**' or 'b)'
-"cb   - the char in the checkbox or '' if there is no checkbox
-function! s:get_item(lnum) "{{{
-  let item = {'lnum': a:lnum}
-  if a:lnum == 0 || a:lnum > line('$')
-    let item.type = 0
-    return item
-  endif
-
-  let matches = matchlist(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem'))
-  if matches == [] ||
-        \ (matches[1] == '' && matches[2] == '') ||
-        \ (matches[1] != '' && matches[2] != '')
-    let item.type = 0
-    return item
-  endif
-
-  let item.cb = matches[3]
-
-  if matches[1] != ''
-    let item.type = 1
-    let item.mrkr = matches[1]
-  else
-    let item.type = 2
-    let item.mrkr = matches[2]
-  endif
-
-  return item
-endfunction "}}}
-
-function! s:empty_item() "{{{
-  return {'type': 0}
-endfunction "}}}
-
-"Returns: level of the line
-"0 is the 'highest' level
-function! s:get_level(lnum) "{{{
-  if getline(a:lnum) =~# '^\s*$'
-    return 0
-  endif
-  if !vimwiki#vars#get_syntaxlocal('recurring_bullets')
-    let level = indent(a:lnum)
-  else
-    let level = s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal(rx_bullet_chars)))-1
-    if level < 0
-      let level = (indent(a:lnum) == 0) ? 0 : 9999
-    endif
-  endif
-  return level
-endfunction "}}}
-
-"Returns: 1, a, i, A, I or ''
-"If in doubt if alphanumeric character or romanian
-"numeral, peek in the previous line
-function! s:guess_kind_of_numbered_item(item) "{{{
-  if a:item.type != 2 | return '' | endif
-  let number_chars = a:item.mrkr[:-2]
-  let divisor = a:item.mrkr[-1:]
-
-  let number_kinds = vimwiki#vars#get_syntaxlocal('number_kinds')
-
-  if number_chars =~# '\d\+'
-    return '1'
-  endif
-  if number_chars =~# '\l\+'
-    if number_chars !~# '^[ivxlcdm]\+' || index(number_kinds, 'i') == -1
-      return 'a'
-    else
-
-      let item_above = s:get_prev_list_item(a:item, 0)
-      if item_above.type != 0
-        if index(number_kinds, 'a') == -1 ||
-              \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'i\+') ||
-              \ s:increment_i(item_above.mrkr[:-2]) ==# number_chars
-          return 'i'
-        else
-          return 'a'
-        endif
-      else
-        if number_chars =~# 'i\+' || index(number_kinds, 'a') == -1
-          return 'i'
-        else
-          return 'a'
-        endif
-      endif
-
-    endif
-  endif
-  if number_chars =~# '\u\+'
-    if number_chars !~# '^[IVXLCDM]\+' || index(number_kinds, 'I') == -1
-      return 'A'
-    else
-
-      let item_above = s:get_prev_list_item(a:item, 0)
-      if item_above.type != 0
-        if index(number_kinds, 'A') == -1 ||
-              \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'I\+') ||
-              \ s:increment_I(item_above.mrkr[:-2]) ==# number_chars
-          return 'I'
-        else
-          return 'A'
-        endif
-      else
-        if number_chars =~# 'I\+' || index(number_kinds, 'A') == -1
-          return 'I'
-        else
-          return 'A'
-        endif
-      endif
-
-    endif
-  endif
-endfunction "}}}
-
-function! s:regexp_of_marker(item) "{{{
-  if a:item.type == 1
-    return vimwiki#u#escape(a:item.mrkr)
-  elseif a:item.type == 2
-    let number_divisors = vimwiki#vars#get_syntaxlocal('number_divisors')
-    for ki in ['d', 'u', 'l']
-      let match = matchstr(a:item.mrkr, '\'.ki.'\+['.number_divisors.']')
-      if match != ''
-        return '\'.ki.'\+'.vimwiki#u#escape(match[-1:])
-      endif
-    endfor
-  else
-    return ''
-  endif
-endfunction "}}}
-
-"get properties of an item }}}
-
-"functions for navigating between items {{{
-
-"Returns: the list item after a:item or an empty item
-"If a:ignore_kind is 1, the markers can differ
-function! s:get_next_list_item(item, ignore_kind) "{{{
-  let org_lvl = s:get_level(a:item.lnum)
-  if !a:ignore_kind
-    let org_regex = s:regexp_of_marker(a:item)
-  endif
-
-  let cur_ln = s:get_next_line(a:item.lnum)
-  while cur_ln <= line('$')
-    let cur_lvl = s:get_level(cur_ln)
-    if cur_lvl <= org_lvl
-      if a:ignore_kind
-        return s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
-      else
-        return s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
-      endif
-    endif
-    let cur_ln = s:get_next_line(cur_ln)
-  endwhile
-  return s:empty_item()
-endfunction "}}}
-
-"Returns: the list item before a:item or an empty item
-"If a:ignore_kind is 1, the markers can differ
-function! s:get_prev_list_item(item, ignore_kind) "{{{
-  let org_lvl = s:get_level(a:item.lnum)
-  if !a:ignore_kind
-    let org_regex = s:regexp_of_marker(a:item)
-  endif
-
-  let cur_ln = s:get_prev_line(a:item.lnum)
-  while cur_ln >= 1
-    let cur_lvl = s:get_level(cur_ln)
-    if cur_lvl <= org_lvl
-      if a:ignore_kind
-        return s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
-      else
-        return s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
-      endif
-    endif
-    let cur_ln = s:get_prev_line(cur_ln)
-  endwhile
-  return s:empty_item()
-endfunction "}}}
-
-function! s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex) "{{{
-  let cur_linecontent = getline(a:cur_ln)
-  if a:cur_lvl == a:org_lvl
-    if cur_linecontent =~# '^\s*'.a:org_regex.'\s'
-      return s:get_item(a:cur_ln)
-    else
-      return s:empty_item()
-    endif
-  elseif a:cur_lvl < a:org_lvl
-    return s:empty_item()
-  endif
-endfunction "}}}
-
-function! s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl) "{{{
-  if a:cur_lvl == a:org_lvl
-    return s:get_item(a:cur_ln)
-  elseif a:cur_lvl < a:org_lvl
-    return s:empty_item()
-  endif
-endfunction "}}}
-
-function! s:get_first_item_in_list(item, ignore_kind) "{{{
-  let cur_item = a:item
-  while 1
-    let prev_item = s:get_prev_list_item(cur_item, a:ignore_kind)
-    if prev_item.type == 0
-      break
-    else
-      let cur_item = prev_item
-    endif
-  endwhile
-  return cur_item
-endfunction "}}}
-
-function! s:get_last_item_in_list(item, ignore_kind) "{{{
-  let cur_item = a:item
-  while 1
-    let next_item = s:get_next_list_item(cur_item, a:ignore_kind)
-    if next_item.type == 0
-      break
-    else
-      let cur_item = next_item
-    endif
-  endwhile
-  return cur_item
-endfunction "}}}
-
-"Returns: lnum+1 in most cases, but skips blank lines and preformatted text,
-"0 in case of nonvalid line.
-"If there is no second argument, 0 is returned at a header, otherwise the
-"header is skipped
-function! s:get_next_line(lnum, ...) "{{{
-  if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
-    let cur_ln = a:lnum + 1
-    while cur_ln <= line('$') &&
-          \ getline(cur_ln) !~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
-      let cur_ln += 1
-    endwhile
-    let next_line = cur_ln
-  else
-    let next_line = nextnonblank(a:lnum+1)
-  endif
-
-  if a:0 > 0 && getline(next_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader')
-    let next_line = s:get_next_line(next_line, 1)
-  endif
-
-  if next_line < 0 || next_line > line('$') ||
-        \ (getline(next_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader') && a:0 == 0)
-    return 0
-  endif
-
-  return next_line
-endfunction "}}}
-
-"Returns: lnum-1 in most cases, but skips blank lines and preformatted text
-"0 in case of nonvalid line and a header, because a header ends every list
-function! s:get_prev_line(lnum) "{{{
-  let prev_line = prevnonblank(a:lnum-1)
-
-  if getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
-    let cur_ln = a:lnum - 1
-    while 1
-      if cur_ln == 0 || getline(cur_ln) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
-        break
-      endif
-      let cur_ln -= 1
-    endwhile
-    let prev_line = cur_ln
-  endif
-
-  if prev_line < 0 || prev_line > line('$') ||
-        \ getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader')
-    return 0
-  endif
-
-  return prev_line
-endfunction "}}}
-
-function! s:get_first_child(item) "{{{
-  if a:item.lnum >= line('$')
-    return s:empty_item()
-  endif
-  let org_lvl = s:get_level(a:item.lnum)
-  let cur_item = s:get_item(s:get_next_line(a:item.lnum))
-  while 1
-    if cur_item.type != 0 && s:get_level(cur_item.lnum) > org_lvl
-      return cur_item
-    endif
-    if cur_item.lnum > line('$') || cur_item.lnum <= 0 ||
-          \ s:get_level(cur_item.lnum) <= org_lvl
-      return s:empty_item()
-    endif
-    let cur_item = s:get_item(s:get_next_line(cur_item.lnum))
-  endwhile
-endfunction "}}}
-
-
-"Returns: the next sibling of a:child, given the parent item
-"Used for iterating over children
-"Note: child items do not necessarily have the same indent, i.e. level
-function! s:get_next_child_item(parent, child) "{{{
-  if a:parent.type == 0 | return s:empty_item() | endif
-  let parent_lvl = s:get_level(a:parent.lnum)
-  let cur_ln = s:get_last_line_of_item_incl_children(a:child)
-  while 1
-    let next_line = s:get_next_line(cur_ln)
-    if next_line == 0 || s:get_level(next_line) <= parent_lvl
-      break
-    endif
-    let cur_ln = next_line
-    let cur_item = s:get_item(cur_ln)
-    if cur_item.type > 0
-      return cur_item
-    endif
-  endwhile
-  return s:empty_item()
-endfunction "}}}
-
-function! s:get_parent(item) "{{{
-  let parent_line = 0
-
-  let cur_ln = prevnonblank(a:item.lnum)
-  let child_lvl = s:get_level(cur_ln)
-  if child_lvl == 0
-    return s:empty_item()
-  endif
-
-  while 1
-    let cur_ln = s:get_prev_line(cur_ln)
-    if cur_ln == 0 | break | endif
-    let cur_lvl = s:get_level(cur_ln)
-    if cur_lvl < child_lvl
-      let cur_item = s:get_item(cur_ln)
-      if cur_item.type == 0
-        let child_lvl = cur_lvl
-        continue
-      endif
-      let parent_line = cur_ln
-      break
-    endif
-  endwhile
-  return s:get_item(parent_line)
-endfunction "}}}
-
-"Returns: the item above or the item below or an empty item
-function! s:get_a_neighbor_item(item) "{{{
-  let prev_item = s:get_prev_list_item(a:item, 1)
-  if prev_item.type != 0
-    return prev_item
-  else
-    let next_item = s:get_next_list_item(a:item, 1)
-    if next_item.type != 0
-      return next_item
-    endif
-  endif
-  return s:empty_item()
-endfunction "}}}
-
-function! s:get_a_neighbor_item_in_column(lnum, column) "{{{
-  let cur_ln = s:get_prev_line(a:lnum)
-  while cur_ln >= 1
-    if s:get_level(cur_ln) <= a:column
-      return s:get_corresponding_item(cur_ln)
-    endif
-    let cur_ln = s:get_prev_line(cur_ln)
-  endwhile
-  return s:empty_item()
-endfunction "}}}
-
-"Returns: the item if there is one in a:lnum
-"else the multiline item a:lnum belongs to
-function! s:get_corresponding_item(lnum) "{{{
-  let item = s:get_item(a:lnum)
-  if item.type != 0
-    return item
-  endif
-  let org_lvl = s:get_level(a:lnum)
-  let cur_ln = a:lnum
-  while cur_ln > 0
-    let cur_lvl = s:get_level(cur_ln)
-    let cur_item = s:get_item(cur_ln)
-    if cur_lvl < org_lvl && cur_item.type != 0
-      return cur_item
-    endif
-    if cur_lvl < org_lvl
-      let org_lvl = cur_lvl
-    endif
-    let cur_ln = s:get_prev_line(cur_ln)
-  endwhile
-  return s:empty_item()
-endfunction "}}}
-
-"Returns: the last line of a (possibly multiline) item, including all children
-function! s:get_last_line_of_item_incl_children(item) "{{{
-  let cur_ln = a:item.lnum
-  let org_lvl = s:get_level(a:item.lnum)
-  while 1
-    let next_line = s:get_next_line(cur_ln)
-    if next_line == 0 || s:get_level(next_line) <= org_lvl
-      return cur_ln
-    endif
-    let cur_ln = next_line
-  endwhile
-endfunction "}}}
-
-"Returns: the last line of a (possibly multiline) item
-"Note: there can be other list items between the first and last line
-function! s:get_last_line_of_item(item) "{{{
-  if a:item.type == 0 | return 0 | endif
-  let org_lvl = s:get_level(a:item.lnum)
-  let last_corresponding_line = a:item.lnum
-
-  let cur_ln = s:get_next_line(a:item.lnum)
-  while 1
-    if cur_ln == 0 || s:get_level(cur_ln) <= org_lvl
-      break
-    endif
-    let cur_item = s:get_item(cur_ln)
-    if cur_item.type == 0
-      let last_corresponding_line = cur_ln
-      let cur_ln = s:get_next_line(cur_ln)
-    else
-      let cur_ln = s:get_next_line(
-            \ s:get_last_line_of_item_incl_children(cur_item))
-    endif
-  endwhile
-
-  return last_corresponding_line
-endfunction "}}}
-
-"functions for navigating between items }}}
-
-"renumber list items {{{
-"Renumbers the current list from a:item on downwards
-"Returns: the last item that was adjusted
-function! s:adjust_numbered_list_below(item, recursive) "{{{
-  if !(a:item.type == 2 || (a:item.type == 1 && a:recursive))
-    return a:item
-  endif
-
-  let kind = s:guess_kind_of_numbered_item(a:item)
-
-  let cur_item = a:item
-  while 1
-    if a:recursive
-      call s:adjust_items_recursively(cur_item)
-    endif
-
-    let next_item = s:get_next_list_item(cur_item, 0)
-    if next_item.type == 0
-      break
-    endif
-
-    if cur_item.type == 2
-      let new_val = s:increment_{kind}(cur_item.mrkr[:-2]) . cur_item.mrkr[-1:]
-      call s:substitute_string_in_line(next_item.lnum, next_item.mrkr, new_val)
-      let next_item.mrkr = new_val
-    endif
-
-    let cur_item = next_item
-  endwhile
-  return cur_item
-endfunction "}}}
-
-function! s:adjust_items_recursively(parent) "{{{
-  if a:parent.type == 0
-    return s:empty_item()
-  end
-
-  let child_item = s:get_first_child(a:parent)
-  if child_item.type == 0
-    return child_item
-  endif
-  while 1
-    let last_item = s:adjust_numbered_list(child_item, 1, 1)
-
-    let child_item = s:get_next_child_item(a:parent, last_item)
-    if child_item.type == 0
-      return last_item
-    endif
-  endwhile
-endfunction "}}}
-
-"Renumbers the list a:item is in.
-"If a:ignore_kind == 0, only the items which have the same kind of marker as
-"a:item are considered, otherwise all items.
-"Returns: the last item that was adjusted
-function! s:adjust_numbered_list(item, ignore_kind, recursive) "{{{
-  if !(a:item.type == 2 || (a:item.type == 1 && (a:ignore_kind || a:recursive)))
-    return s:empty_item()
-  end
-
-  let first_item = s:get_first_item_in_list(a:item, a:ignore_kind)
-
-  while 1
-    if first_item.type == 2
-      let new_mrkr = s:guess_kind_of_numbered_item(first_item) .
-            \ first_item.mrkr[-1:]
-      call s:substitute_string_in_line(first_item.lnum, first_item.mrkr,
-            \ new_mrkr)
-      let first_item.mrkr = new_mrkr
-    endif
-
-    let last_item = s:adjust_numbered_list_below(first_item, a:recursive)
-
-    let next_first_item = s:get_next_list_item(last_item, 1)
-    if a:ignore_kind == 0 || next_first_item.type == 0
-      return last_item
-    endif
-    let first_item = next_first_item
-  endwhile
-endfunction "}}}
-
-"Renumbers the list the cursor is in
-"also update its parents checkbox state
-function! vimwiki#lst#adjust_numbered_list() "{{{
-  let cur_item = s:get_corresponding_item(line('.'))
-  if cur_item.type == 0 | return | endif
-  call s:adjust_numbered_list(cur_item, 1, 0)
-  call s:update_state(s:get_parent(cur_item))
-endfunction "}}}
-
-"Renumbers all lists of the buffer
-"of course, this might take some seconds
-function! vimwiki#lst#adjust_whole_buffer() "{{{
-  let cur_ln = 1
-  while 1
-    let cur_item = s:get_item(cur_ln)
-    if cur_item.type != 0
-      let cur_item = s:adjust_numbered_list(cur_item, 0, 1)
-    endif
-    let cur_ln = s:get_next_line(cur_item.lnum, 1)
-    if cur_ln <= 0 || cur_ln > line('$')
-      return
-    endif
-  endwhile
-endfunction "}}}
-
-"renumber list items }}}
-
-"checkbox stuff {{{
-
-"Returns: the rate of checkboxed list item in percent
-function! s:get_rate(item) "{{{
-  if a:item.type == 0 || a:item.cb == ''
-    return -1
-  endif
-  let state = a:item.cb
-  if state == vimwiki#vars#get_global('listsym_rejected')
-    return -1
-  endif
-  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
-  return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 100/(n-1)
-endfunction "}}}
-
-"Set state of the list item to [ ] or [o] or whatever
-"Returns: 1 if the state changed, 0 otherwise
-function! s:set_state(item, new_rate) "{{{
-  let new_state = s:rate_to_state(a:new_rate)
-  let old_state = s:rate_to_state(s:get_rate(a:item))
-  if new_state !=# old_state
-    call s:substitute_rx_in_line(a:item.lnum, '\[.]', '['.new_state.']')
-    return 1
-  else
-    return 0
-  endif
-endfunction "}}}
-
-"Set state of the list item to [ ] or [o] or whatever
-"Updates the states of its child items
-function! s:set_state_plus_children(item, new_rate) "{{{
-  call s:set_state(a:item, a:new_rate)
-
-  let child_item = s:get_first_child(a:item)
-  while 1
-    if child_item.type == 0
-      break
-    endif
-    if child_item.cb != ''
-      call s:set_state_plus_children(child_item, a:new_rate)
-    endif
-    let child_item = s:get_next_child_item(a:item, child_item)
-  endwhile
-endfunction "}}}
-
-"Returns: the appropriate symbol for a given percent rate
-function! s:rate_to_state(rate) "{{{
-  let listsyms_list = vimwiki#vars#get_syntaxlocal('listsyms_list')
-  let state = ''
-  let n = len(listsyms_list)
-  if a:rate == 100
-    let state = listsyms_list[n-1]
-  elseif a:rate == 0
-    let state = listsyms_list[0]
-  elseif a:rate == -1
-    let state = vimwiki#vars#get_global('listsym_rejected')
-  else
-    let index = float2nr(ceil(a:rate/100.0*(n-2)))
-    let state = listsyms_list[index]
-  endif
-  return state
-endfunction "}}}
-
-"updates the symbol of a checkboxed item according to the symbols of its
-"children
-function! s:update_state(item) "{{{
-  if a:item.type == 0 || a:item.cb == ''
-    return
-  endif
-
-  let sum_children_rate = 0
-  let count_children_with_cb = 0
-
-  let child_item = s:get_first_child(a:item)
-
-  while 1
-    if child_item.type == 0
-      break
-    endif
-    if child_item.cb != ''
-      let rate = s:get_rate(child_item)
-      if rate != -1
-        let count_children_with_cb += 1
-        let sum_children_rate += rate
-      endif
-    endif
-    let child_item = s:get_next_child_item(a:item, child_item)
-  endwhile
-
-  if count_children_with_cb > 0
-    let new_rate = sum_children_rate / count_children_with_cb
-    call s:set_state_recursively(a:item, new_rate)
-  else
-    let rate = s:get_rate(a:item)
-    if rate > 0 && rate < 100
-      call s:set_state_recursively(a:item, 0)
-    endif
-  endif
-endfunction "}}}
-
-function! s:set_state_recursively(item, new_rate) "{{{
-  let state_changed = s:set_state(a:item, a:new_rate)
-  if state_changed
-    call s:update_state(s:get_parent(a:item))
-  endif
-endfunction "}}}
-
-"Creates checkbox in a list item.
-"Returns: 1 if successful
-function! s:create_cb(item) "{{{
-  if a:item.type == 0 || a:item.cb != ''
-    return 0
-  endif
-
-  let new_item = a:item
-  let new_item.cb = vimwiki#vars#get_syntaxlocal('listsyms_list')[0]
-  call s:substitute_rx_in_line(new_item.lnum,
-        \ vimwiki#u#escape(new_item.mrkr) . '\zs\ze', ' [' . new_item.cb . ']')
-
-  call s:update_state(new_item)
-  return 1
-endfunction "}}}
-
-function! s:remove_cb(item) "{{{
-  let item = a:item
-  if item.type != 0 && item.cb != ''
-    let item.cb = ''
-    call s:substitute_rx_in_line(item.lnum, '\s\+\[.\]', '')
-  endif
-  return item
-endfunction "}}}
-
-"Change state of checkbox
-"in the lines of the given range
-function! s:change_cb(from_line, to_line, new_rate) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  let parent_items_of_lines = []
-
-  for cur_ln in range(from_item.lnum, a:to_line)
-    let cur_item = s:get_item(cur_ln)
-    if cur_item.type != 0 && cur_item.cb != ''
-      call s:set_state_plus_children(cur_item, a:new_rate)
-      let cur_parent_item = s:get_parent(cur_item)
-      if index(parent_items_of_lines, cur_parent_item) == -1
-        call insert(parent_items_of_lines, cur_parent_item)
-      endif
-    endif
-  endfor
-
-  for parent_item in parent_items_of_lines
-    call s:update_state(parent_item)
-  endfor
-
-endfunction "}}}
-
-"Toggles checkbox between two states in the lines of the given range,
-"creates chceckboxes if there aren't any.
-function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  if from_item.cb == ''
-
-    "if from_line has no CB, make a CB in every selected line
-    let parent_items_of_lines = []
-    for cur_ln in range(from_item.lnum, a:to_line)
-      let cur_item = s:get_item(cur_ln)
-      let success = s:create_cb(cur_item)
-
-      if success
-        let cur_parent_item = s:get_parent(cur_item)
-        if index(parent_items_of_lines, cur_parent_item) == -1
-          call insert(parent_items_of_lines, cur_parent_item)
-        endif
-      endif
-    endfor
-
-    for parent_item in parent_items_of_lines
-      call s:update_state(parent_item)
-    endfor
-
-  else
-
-    "if from_line has CB, toggle it and set all siblings to the same new state
-    let rate_first_line = s:get_rate(from_item)
-    let new_rate = rate_first_line == a:state1 ? a:state2 : a:state1
-
-    call s:change_cb(a:from_line, a:to_line, new_rate)
-
-  endif
-
-endfunction "}}}
-
-"Decrement checkbox between [ ] and [X]
-"in the lines of the given range
-function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  "if from_line has CB, decrement it and set all siblings to the same new state
-  let rate_first_line = s:get_rate(from_item)
-  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
-  let new_rate = max([rate_first_line - 100/(n-1)-1, 0])
-
-  call s:change_cb(a:from_line, a:to_line, new_rate)
-
-endfunction "}}}
-
-"Increment checkbox between [ ] and [X]
-"in the lines of the given range
-function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  "if from_line has CB, increment it and set all siblings to the same new state
-  let rate_first_line = s:get_rate(from_item)
-  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
-  let new_rate = min([rate_first_line + 100/(n-1)+1, 100])
-
-  call s:change_cb(a:from_line, a:to_line, new_rate)
-
-endfunction "}}}
-
-"Toggles checkbox between [ ] and [X] or creates one
-"in the lines of the given range
-function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
-  return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
-endfunction "}}}
-
-"Toggles checkbox between [ ] and [-] or creates one
-"in the lines of the given range
-function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
-  return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
-endfunction "}}}
-
-"Increment checkbox between [ ] and [X]
-"in the lines of the given range
-function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    return
-  endif
-
-  "if from_line has CB, increment it and set all siblings to the same new state
-  let rate_first_line = s:get_rate(from_item)
-  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
-  let new_rate = min([rate_first_line + 100/(n-1)+1, 100])
-
-  call s:change_cb(a:from_line, a:to_line, new_rate)
-
-endfunction "}}}
-
-"Toggles checkbox between [ ] and [X] or creates one
-"in the lines of the given range
-function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
-  return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
-endfunction "}}}
-
-"Toggles checkbox between [ ] and [-] or creates one
-"in the lines of the given range
-function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
-  return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
-endfunction "}}}
-
-function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
-  let first_item = s:get_corresponding_item(a:first_line)
-  let last_item = s:get_corresponding_item(a:last_line)
-
-  if first_item.type == 0 || last_item.type == 0
-    return
-  endif
-
-  let parent_items_of_lines = []
-  let cur_ln = first_item.lnum
-  while 1
-    if cur_ln <= 0 || cur_ln > last_item.lnum | break | endif
-    let cur_item = s:get_item(cur_ln)
-    if cur_item.type != 0
-      let cur_item = s:remove_cb(cur_item)
-      let cur_parent_item = s:get_parent(cur_item)
-      if index(parent_items_of_lines, cur_parent_item) == -1
-        call insert(parent_items_of_lines, cur_parent_item)
-      endif
-    endif
-    let cur_ln = s:get_next_line(cur_ln)
-  endwhile
-  for parent_item in parent_items_of_lines
-    call s:update_state(parent_item)
-  endfor
-endfunction "}}}
-
-function! vimwiki#lst#remove_cb_in_list() "{{{
-  let first_item = s:get_first_item_in_list(
-        \ s:get_corresponding_item(line('.')), 0)
-
-  let cur_item = first_item
-  while 1
-    let next_item = s:get_next_list_item(cur_item, 0)
-    let cur_item = s:remove_cb(cur_item)
-    if next_item.type == 0
-      break
-    else
-      let cur_item = next_item
-    endif
-  endwhile
-
-  call s:update_state(s:get_parent(first_item))
-endfunction "}}}
-
-"checkbox stuff }}}
-
-"change the level of list items {{{
-
-function! s:set_indent(lnum, new_indent) "{{{
-  if &expandtab
-    let indentstring = repeat(' ', a:new_indent)
-  else
-    let indentstring = repeat('\t', a:new_indent / &tabstop) .
-          \ repeat(' ', a:new_indent % &tabstop)
-  endif
-  call s:substitute_rx_in_line(a:lnum, '^\s*', indentstring)
-endfunction "}}}
-
-function! s:decrease_level(item) "{{{
-  let removed_indent = 0
-  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
-    if s:string_length(a:item.mrkr) >= 2
-      call s:substitute_string_in_line(a:item.lnum,
-            \ s:first_char(a:item.mrkr), '')
-      let removed_indent = -1
-    endif
-  else
-    let old_indent = indent(a:item.lnum)
-    if &shiftround
-      let new_indent = (old_indent - 1) / vimwiki#u#sw() * vimwiki#u#sw()
-    else
-      let new_indent = old_indent - vimwiki#u#sw()
-    endif
-    call s:set_indent(a:item.lnum, new_indent)
-    let removed_indent = new_indent - old_indent
-  endif
-  return removed_indent
-endfunction "}}}
-
-function! s:increase_level(item) "{{{
-  let additional_indent = 0
-  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
-    call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:item.mrkr .
-          \ s:first_char(a:item.mrkr))
-    let additional_indent = 1
-  else
-    let old_indent = indent(a:item.lnum)
-    if &shiftround
-      let new_indent = (old_indent / vimwiki#u#sw() + 1) * vimwiki#u#sw()
-    else
-      let new_indent = old_indent + vimwiki#u#sw()
-    endif
-    call s:set_indent(a:item.lnum, new_indent)
-    let additional_indent = new_indent - old_indent
-  endif
-  return additional_indent
-endfunction "}}}
-
-"adds a:indent_by to the current indent
-"a:indent_by can be negative
-function! s:indent_line_by(lnum, indent_by) "{{{
-  let item = s:get_item(a:lnum)
-  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(item.mrkr)) > -1
-    if a:indent_by > 0
-      call s:substitute_string_in_line(a:lnum, item.mrkr,
-            \ item.mrkr . s:first_char(item.mrkr))
-    elseif a:indent_by < 0
-      call s:substitute_string_in_line(a:lnum, s:first_char(item.mrkr), '')
-    endif
-  else
-    call s:set_indent(a:lnum, indent(a:lnum) + a:indent_by)
-  endif
-endfunction "}}}
-
-"changes lvl of lines in selection
-function! s:change_level(from_line, to_line, direction, plus_children) "{{{
-  let from_item = s:get_corresponding_item(a:from_line)
-  if from_item.type == 0
-    if a:direction ==# 'increase' && a:from_line == a:to_line &&
-          \ empty(getline(a:from_line))
-      "that's because :> doesn't work on an empty line
-      normal! gi
-    else
-      execute a:from_line.','.a:to_line.(a:direction ==# 'increase' ? '>' : '<')
-    endif
-    return
-  endif
-
-  if a:direction ==# 'decrease' && s:get_level(from_item.lnum) == 0
-    return
-  endif
-
-  if a:from_line == a:to_line
-    if a:plus_children
-      let to_line = s:get_last_line_of_item_incl_children(from_item)
-    else
-      let to_line = s:get_last_line_of_item(from_item)
-    endif
-  else
-    let to_item = s:get_corresponding_item(a:to_line)
-    if to_item.type == 0
-      let to_line = a:to_line
-    else
-      if a:plus_children
-        let to_line = s:get_last_line_of_item_incl_children(to_item)
-      else
-        let to_line = s:get_last_line_of_item(to_item)
-      endif
-    endif
-  endif
-
-  if to_line == 0
-    return
-  endif
-
-  let to_be_adjusted = s:get_a_neighbor_item(from_item)
-  let old_parent = s:get_parent(from_item)
-  let first_line_level = s:get_level(from_item.lnum)
-  let more_than_one_level_concerned = 0
-
-  let first_line_indented_by =
-        \ (a:direction ==# 'increase') ?
-        \ s:increase_level(from_item) : s:decrease_level(from_item)
-
-  let cur_ln = s:get_next_line(from_item.lnum)
-  while cur_ln > 0 && cur_ln <= to_line
-    if !more_than_one_level_concerned &&
-          \ s:get_level(cur_ln) != first_line_level &&
-          \ s:get_item(cur_ln).type != 0
-      let more_than_one_level_concerned = 1
-    endif
-    call s:indent_line_by(cur_ln, first_line_indented_by)
-    let cur_ln = s:get_next_line(cur_ln, 1)
-  endwhile
-
-  if a:from_line == a:to_line
-    call s:adjust_mrkr(from_item)
-  endif
-  call s:update_state(old_parent)
-  let from_item = s:get_item(from_item.lnum)
-  if from_item.cb != ''
-    call s:update_state(from_item)
-    call s:update_state(s:get_parent(from_item))
-  endif
-
-  if more_than_one_level_concerned
-    call vimwiki#lst#adjust_whole_buffer()
-  else
-    call s:adjust_numbered_list(from_item, 0, 0)
-    call s:adjust_numbered_list(to_be_adjusted, 0, 0)
-  endif
-endfunction "}}}
-
-function! vimwiki#lst#change_level(from_line, to_line, direction, plus_children) "{{{
-  let cur_col = col('$') - col('.')
-  call s:change_level(a:from_line, a:to_line, a:direction, a:plus_children)
-  call cursor('.', col('$') - cur_col)
-endfunction "}}}
-
-"indent line a:lnum to be the continuation of a:prev_item
-function! s:indent_multiline(prev_item, lnum) "{{{
-  if a:prev_item.type != 0
-    call s:set_indent(a:lnum, s:text_begin(a:prev_item.lnum))
-  endif
-endfunction "}}}
-
-"change the level of list items }}}
-
-"change markers of list items {{{
-"Returns: the position of a marker in g:vimwiki_list_markers
-function! s:get_idx_list_markers(item) "{{{
-  if a:item.type == 1
-    let m = s:first_char(a:item.mrkr)
-  else
-    let m = s:guess_kind_of_numbered_item(a:item) . a:item.mrkr[-1:]
-  endif
-  return index(vimwiki#vars#get_syntaxlocal('list_markers'), m)
-endfunction "}}}
-
-"changes the marker of the given item to the next in g:vimwiki_list_markers
-function! s:get_next_mrkr(item) "{{{
-  let markers = vimwiki#vars#get_syntaxlocal('list_markers')
-  if a:item.type == 0
-    let new_mrkr = markers[0]
-  else
-    let idx = s:get_idx_list_markers(a:item)
-    let new_mrkr = markers[(idx+1) % len(markers)]
-  endif
-  return new_mrkr
-endfunction "}}}
-
-"changes the marker of the given item to the previous in g:vimwiki_list_markers
-function! s:get_prev_mrkr(item) "{{{
-  let markers = vimwiki#vars#get_syntaxlocal('list_markers')
-  if a:item.type == 0
-    return markers[-1]
-  endif
-  let idx = s:get_idx_list_markers(a:item)
-  if idx == -1
-    return markers[-1]
-  else
-    return markers[(idx - 1 + len(markers)) %
-          \ len(markers)]
-  endif
-endfunction "}}}
-
-function! s:set_new_mrkr(item, new_mrkr) "{{{
-  if a:item.type == 0
-    call s:substitute_rx_in_line(a:item.lnum, '^\s*\zs\ze', a:new_mrkr.' ')
-    if indent(a:item.lnum) == 0 && !vimwiki#vars#get_syntaxlocal('recurring_bullets')
-      call s:set_indent(a:item.lnum, vimwiki#lst#get_list_margin())
-    endif
-  else
-    call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:new_mrkr)
-  endif
-endfunction "}}}
-
-function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
-  let cur_col_from_eol = col("$") - (a:mode ==# "i" ? col("'^") : col('.'))
-  let new_mrkr = a:new_mrkr
-  let cur_ln = a:from_line
-  while 1
-    let cur_item = s:get_item(cur_ln)
-
-    if new_mrkr ==# "next"
-      let new_mrkr = s:get_next_mrkr(cur_item)
-    elseif new_mrkr ==# "prev"
-      let new_mrkr = s:get_prev_mrkr(cur_item)
-    endif
-
-    "handle markers like ***
-    if index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(new_mrkr)) > -1
-      "use *** if the item above has *** too
-      let item_above = s:get_prev_list_item(cur_item, 1)
-      if item_above.type == 1 &&
-            \ s:first_char(item_above.mrkr) ==# s:first_char(new_mrkr)
-        let new_mrkr = item_above.mrkr
-      else
-        "use *** if the item below has *** too
-        let item_below = s:get_next_list_item(cur_item, 1)
-        if item_below.type == 1 &&
-              \ s:first_char(item_below.mrkr) ==# s:first_char(new_mrkr)
-          let new_mrkr = item_below.mrkr
-        else
-          "if the old is ### and the new is * use ***
-          if cur_item.type == 1 &&
-                \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(cur_item.mrkr))>-1
-            let new_mrkr = repeat(new_mrkr, s:string_length(cur_item.mrkr))
-          else
-            "use *** if the parent item has **
-            let parent_item = s:get_parent(cur_item)
-            if parent_item.type == 1 &&
-                  \ s:first_char(parent_item.mrkr) ==# s:first_char(new_mrkr)
-              let new_mrkr = repeat(s:first_char(parent_item.mrkr),
-                    \ s:string_length(parent_item.mrkr)+1)
-            endif
-          endif
-        endif
-      endif
-
-    endif
-
-    call s:set_new_mrkr(cur_item, new_mrkr)
-    call s:adjust_numbered_list(s:get_item(cur_ln), 1, 0)
-
-    if cur_ln >= a:to_line | break | endif
-    let cur_ln = s:get_next_line(cur_ln, 1)
-  endwhile
-
-  call cursor('.', col('$') - cur_col_from_eol)
-endfunction "}}}
-
-function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{
-  let cur_item = s:get_corresponding_item(line('.'))
-  let first_item = s:get_first_item_in_list(cur_item, 0)
-  let last_item = s:get_last_item_in_list(cur_item, 0)
-  if first_item.type == 0 || last_item.type == 0 | return | endif
-  let first_item_line = first_item.lnum
-
-  let cur_item = first_item
-  while cur_item.type != 0 && cur_item.lnum <= last_item.lnum
-    call s:set_new_mrkr(cur_item, a:new_mrkr)
-    let cur_item = s:get_next_list_item(cur_item, 1)
-  endwhile
-
-  call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0)
-endfunction "}}}
-
-"sets kind of the item depending on neighbor items and the parent item
-function! s:adjust_mrkr(item) "{{{
-  if a:item.type == 0 || vimwiki#vars#get_syntaxlocal('recurring_bullets')
-    return
-  endif
-
-  let new_mrkr = a:item.mrkr
-  let neighbor_item = s:get_a_neighbor_item(a:item)
-  if neighbor_item.type != 0
-    let new_mrkr = neighbor_item.mrkr
-  endif
-
-  "if possible, set e.g. *** if parent has ** as marker
-  if neighbor_item.type == 0 && a:item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
-    let parent_item = s:get_parent(a:item)
-    if parent_item.type == 1 &&
-          \ s:first_char(parent_item.mrkr) ==# s:first_char(a:item.mrkr)
-      let new_mrkr = repeat(s:first_char(parent_item.mrkr),
-            \ s:string_length(parent_item.mrkr)+1)
-    endif
-  endif
-
-  call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, new_mrkr)
-  call s:adjust_numbered_list(a:item, 0, 1)
-endfunction "}}}
-
-function! s:clone_marker_from_to(from, to) "{{{
-  let item_from = s:get_item(a:from)
-  if item_from.type == 0 | return | endif
-  let new_mrkr = item_from.mrkr . ' '
-  call s:substitute_rx_in_line(a:to, '^\s*', new_mrkr)
-  let new_indent = ( vimwiki#vars#get_syntaxlocal('recurring_bullets') ? 0 : indent(a:from) )
-  call s:set_indent(a:to, new_indent)
-  if item_from.cb != ''
-    call s:create_cb(s:get_item(a:to))
-    call s:update_state(s:get_parent(s:get_item(a:to)))
-  endif
-  if item_from.type == 2
-    let adjust_from = ( a:from < a:to ? a:from : a:to )
-    call s:adjust_numbered_list_below(s:get_item(adjust_from), 0)
-  endif
-endfunction "}}}
-
-function! s:remove_mrkr(item) "{{{
-  let item = a:item
-  if item.cb != ''
-    let item = s:remove_cb(item)
-    let parent_item = s:get_parent(item)
-  else
-    let parent_item = s:empty_item()
-  endif
-  call s:substitute_rx_in_line(item.lnum, vimwiki#u#escape(item.mrkr).'\s*', '')
-  call remove(item, 'mrkr')
-  call remove(item, 'cb')
-  let item.type = 0
-  call s:update_state(parent_item)
-  return item
-endfunction "}}}
-
-function! s:create_marker(lnum) "{{{
-  let new_sibling = s:get_corresponding_item(a:lnum)
-  if new_sibling.type == 0
-    let new_sibling = s:get_a_neighbor_item_in_column(a:lnum, virtcol('.'))
-  endif
-  if new_sibling.type != 0
-    call s:clone_marker_from_to(new_sibling.lnum, a:lnum)
-  else
-    let cur_item = s:get_item(a:lnum)
-    call s:set_new_mrkr(cur_item, vimwiki#vars#get_syntaxlocal('list_markers')[0])
-    call s:adjust_numbered_list(cur_item, 0, 0)
-  endif
-endfunction "}}}
-
-"change markers of list items }}}
-
-"handle keys {{{
-function! vimwiki#lst#kbd_o() "{{{
-  let fold_end = foldclosedend('.')
-  let lnum = (fold_end == -1) ? line('.') : fold_end
-  let cur_item = s:get_item(lnum)
-  "inserting and deleting the x is necessary
-  "because otherwise the indent is lost
-  normal! ox
-  if cur_item.lnum < s:get_last_line_of_item(cur_item)
-    call s:indent_multiline(cur_item, cur_item.lnum+1)
-  else
-    call s:clone_marker_from_to(cur_item.lnum, cur_item.lnum+1)
-  endif
-  startinsert!
-endfunction "}}}
-
-function! vimwiki#lst#kbd_O() "{{{
-  normal! Ox
-  let cur_ln = line('.')
-  if getline(cur_ln+1) !~# '^\s*$'
-    call s:clone_marker_from_to(cur_ln+1, cur_ln)
-  else
-    call s:clone_marker_from_to(cur_ln-1, cur_ln)
-  endif
-  startinsert!
-endfunction "}}}
-
-function! s:cr_on_empty_list_item(lnum, behavior) "{{{
-  if a:behavior == 1
-    "just make a new list item
-    normal! gi
-
-    call s:clone_marker_from_to(a:lnum, a:lnum+1)
-    startinsert!
-    return
-  elseif a:behavior == 2
-    "insert new marker but remove marker in old line
-    call append(a:lnum-1, '')
-    startinsert!
-    return
-  elseif a:behavior == 3
-    "list is finished, but cursor stays in current line
-    let item = s:get_item(a:lnum)
-    let neighbor_item = s:get_a_neighbor_item(item)
-    let child_item = s:get_first_child(item)
-    let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
-    normal! "_cc
-    call s:adjust_numbered_list(neighbor_item, 0, 0)
-    call s:adjust_numbered_list(child_item, 0, 0)
-    call s:update_state(parent_item)
-    startinsert
-    return
-  elseif a:behavior == 4
-    "list is finished, but cursor goes to next line
-    let item = s:get_item(a:lnum)
-    let neighbor_item = s:get_a_neighbor_item(item)
-    let child_item = s:get_first_child(item)
-    let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
-    normal! "_cc
-    call s:adjust_numbered_list(neighbor_item, 0, 0)
-    call s:adjust_numbered_list(child_item, 0, 0)
-    call s:update_state(parent_item)
-    startinsert
-    return
-  elseif a:behavior == 5
-    "successively decrease level
-    if s:get_level(a:lnum) > 0
-      call s:change_level(a:lnum, a:lnum, 'decrease', 0)
-      startinsert!
-    else
-      let item = s:get_item(a:lnum)
-      let neighbor_item = s:get_a_neighbor_item(item)
-      let child_item = s:get_first_child(item)
-      let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
-      normal! "_cc
-      call s:adjust_numbered_list(neighbor_item, 0, 0)
-      call s:adjust_numbered_list(child_item, 0, 0)
-      call s:update_state(parent_item)
-      startinsert
-    endif
-    return
-  endif
-endfunction "}}}
-
-function! s:cr_on_empty_line(lnum, behavior) "{{{
-  "inserting and deleting the x is necessary
-  "because otherwise the indent is lost
-  normal! gi
-x
-  if a:behavior == 2 || a:behavior == 3
-    call s:create_marker(a:lnum+1)
-  endif
-endfunction "}}}
-
-function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
-  if a:insert_new_marker
-    "the ultimate feature of this script: make new marker on <CR>
-    normal! gi
-
-    call s:clone_marker_from_to(a:lnum, a:lnum+1)
-    "tiny sweet extra feature: indent next line if current line ends with :
-    if !a:not_at_eol && getline(a:lnum) =~# ':$'
-      call s:change_level(a:lnum+1, a:lnum+1, 'increase', 0)
-    endif
-  else
-    " || (cur_item.lnum < s:get_last_line_of_item(cur_item))
-    "indent this line so that it becomes the continuation of the line above
-    normal! gi
-
-    let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
-    call s:indent_multiline(prev_line, a:lnum+1)
-  endif
-endfunction "}}}
-
-function! vimwiki#lst#kbd_cr(normal, just_mrkr) "{{{
-  let lnum = line('.')
-  let has_bp = s:line_has_marker(lnum)
-
-  if has_bp != 0 && virtcol('.') < s:text_begin(lnum)
-    call append(lnum-1, '')
-    startinsert!
-    return
-  endif
-
-  if has_bp == 1
-    call s:cr_on_empty_list_item(lnum, a:just_mrkr)
-    return
-  endif
-
-  let insert_new_marker = (a:normal == 1 || a:normal == 3)
-  if getline('.')[col("'^")-1:] =~# '^\s\+$'
-    let cur_col = 0
-  else
-    let cur_col = col("$") - col("'^")
-    if getline('.')[col("'^")-1] =~# '\s' && exists("*strdisplaywidth")
-      let ws_behind_cursor =
-            \ strdisplaywidth(matchstr(getline('.')[col("'^")-1:], '\s\+'),
-            \ virtcol("'^")-1)
-      let cur_col -= ws_behind_cursor
-    endif
-    if insert_new_marker && cur_col == 0 && getline(lnum) =~# '\s$'
-      let insert_new_marker = 0
-    endif
-  endif
-
-  if has_bp == 0
-    call s:cr_on_empty_line(lnum, a:normal)
-  endif
-
-  if has_bp == 2
-    call s:cr_on_list_item(lnum, insert_new_marker, cur_col)
-  endif
-
-  call cursor(lnum+1, col("$") - cur_col)
-  if cur_col == 0
-    startinsert!
-  else
-    startinsert
-  endif
-
-endfunction "}}}
-
-"creates a list item in the current line or removes it
-function! vimwiki#lst#toggle_list_item() "{{{
-  let cur_col_from_eol = col("$") - col("'^")
-  let cur_item = s:get_item(line('.'))
-
-  if cur_item.type == 0
-    call s:create_marker(cur_item.lnum)
-  else
-    let prev_item = s:get_prev_list_item(cur_item, 1)
-    if prev_item.type == 0
-      let prev_item = s:get_corresponding_item(s:get_prev_line(cur_item.lnum))
-    endif
-    let cur_item = s:remove_mrkr(cur_item)
-    let adjust_prev_item = (prev_item.type == 2 &&
-          \ s:get_level(cur_item.lnum) <= s:get_level(prev_item.lnum)) ? 1 : 0
-    call s:indent_multiline(prev_item, cur_item.lnum)
-    if adjust_prev_item
-      call s:adjust_numbered_list_below(prev_item, 0)
-    endif
-  endif
-
-  "set cursor position s.t. it's on the same char as before
-  let new_cur_col = col("$") - cur_col_from_eol
-  call cursor(cur_item.lnum, new_cur_col >= 1 ? new_cur_col : 1)
-
-  if cur_col_from_eol == 0 || getline(cur_item.lnum) =~# '^\s*$'
-    startinsert!
-  else
-    startinsert
-  endif
-endfunction "}}}
-
-"handle keys }}}
-
-"misc stuff {{{
-
-function! vimwiki#lst#setup_marker_infos() "{{{
-  let l:bullet_types=g:vimwiki_bullet_types
-  if exists("g:vimwiki_additional_bullet_types")
-    call extend(l:bullet_types, g:vimwiki_additional_bullet_types)
-  endif
-  let s:rx_bullet_chars = '['.join(keys(l:bullet_types), '').']\+'
-
-  let s:multiple_bullet_chars = []
-  for i in keys(l:bullet_types)
-    if l:bullet_types[i] == 1
-      call add(s:multiple_bullet_chars, i)
-    endif
-  endfor
-
-  let s:number_kinds = []
-  let s:number_divisors = ""
-  for i in g:vimwiki_number_types
-    call add(s:number_kinds, i[0])
-    let s:number_divisors .= vimwiki#u#escape(i[1])
-  endfor
-
-  let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
-        \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
-
-  "create regexp for bulleted list items
-  let g:vimwiki_rxListBullet = join( map(keys(l:bullet_types),
-        \'vimwiki#u#escape(v:val).repeat("\\+", l:bullet_types[v:val])'
-        \ ) , '\|')
-
-  "create regex for numbered list items
-  if !empty(g:vimwiki_number_types)
-    let g:vimwiki_rxListNumber = '\C\%('
-    for type in g:vimwiki_number_types[:-2]
-      let g:vimwiki_rxListNumber .= s:char_to_rx[type[0]] .
-            \ vimwiki#u#escape(type[1]) . '\|'
-    endfor
-    let g:vimwiki_rxListNumber .= s:char_to_rx[g:vimwiki_number_types[-1][0]].
-          \ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
-  else
-    "regex that matches nothing
-    let g:vimwiki_rxListNumber = '$^'
-  endif
-
-  "the user can set the listsyms as string, but vimwiki needs a list
-  let g:vimwiki_listsyms_list = split(g:vimwiki_listsyms, '\zs')
-
-  if match(g:vimwiki_listsyms, g:vimwiki_listsym_rejected) != -1
-    echomsg "Warning: g:vimwiki_listsyms and g:vimwiki_listsym_rejected overlap"
-  endif
-endfunction "}}}
-
-function! vimwiki#lst#TO_list_item(inner, visual) "{{{
-  let lnum = prevnonblank('.')
-  let item = s:get_corresponding_item(lnum)
-  if item.type == 0
-    return
-  endif
-  let from_line = item.lnum
-  if a:inner
-    let to_line = s:get_last_line_of_item(item)
-  else
-    let to_line = s:get_last_line_of_item_incl_children(item)
-  endif
-  normal! V
-  call cursor(to_line, 0)
-  normal! o
-  call cursor(from_line, 0)
-endfunction "}}}
-
-fun! vimwiki#lst#fold_level(lnum) "{{{
-  let cur_item = s:get_item(a:lnum)
-  if cur_item.type != 0
-    let parent_item = s:get_parent(cur_item)
-    let child_item = s:get_first_child(cur_item)
-    let next_item = s:get_next_child_item(parent_item, cur_item)
-    if child_item.type != 0
-      return 'a1'
-    elseif next_item.type == 0
-      return 's1'
-    endif
-  endif
-  return '='
-endf "}}}
-
-"misc stuff }}}
+" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" Vimwiki autoload plugin file
+" Desc: Everything concerning lists and checkboxes
+" Home: https://github.com/vimwiki/vimwiki/
+
+if exists("g:loaded_vimwiki_list_auto") || &cp
+  finish
+endif
+let g:loaded_vimwiki_list_auto = 1
+
+"incrementation functions for the various kinds of numbers {{{
+
+function! s:increment_1(value) "{{{
+  return eval(a:value) + 1
+endfunction "}}}
+
+function! s:increment_A(value) "{{{
+  let list_of_chars = split(a:value, '.\zs')
+  let done = 0
+  for idx in reverse(range(len(list_of_chars)))
+    let cur_num = char2nr(list_of_chars[idx])
+    if cur_num < 90
+      let list_of_chars[idx] = nr2char(cur_num + 1)
+      let done = 1
+      break
+    else
+      let list_of_chars[idx] = 'A'
+    endif
+  endfor
+  if !done
+    call insert(list_of_chars, 'A')
+  endif
+  return join(list_of_chars, '')
+endfunction "}}}
+
+function! s:increment_a(value) "{{{
+  let list_of_chars = split(a:value, '.\zs')
+  let done = 0
+  for idx in reverse(range(len(list_of_chars)))
+    let cur_num = char2nr(list_of_chars[idx])
+    if cur_num < 122
+      let list_of_chars[idx] = nr2char(cur_num + 1)
+      let done = 1
+      break
+    else
+      let list_of_chars[idx] = 'a'
+    endif
+  endfor
+  if !done
+    call insert(list_of_chars, 'a')
+  endif
+  return join(list_of_chars, '')
+endfunction "}}}
+
+function! s:increment_I(value) "{{{
+  let subst_list = [ ['XLVIII$', 'IL'], ['VIII$', 'IX'], ['III$', 'IV'],
+        \ ['DCCCXCIX$', 'CM'], ['CCCXCIX$', 'CD'], ['LXXXIX$', 'XC'],
+        \ ['XXXIX$', 'XL'], ['\(I\{1,2\}\)$', '\1I'], ['CDXCIX$', 'D'],
+        \ ['CMXCIX$', 'M'], ['XCIX$', 'C'], ['I\([VXLCDM]\)$', '\1'],
+        \ ['\([VXLCDM]\)$', '\1I'] ]
+  for [regex, subst] in subst_list
+    if a:value =~# regex
+      return substitute(a:value, regex, subst, '')
+    endif
+  endfor
+  return ''
+endfunction "}}}
+
+function! s:increment_i(value) "{{{
+  let subst_list = [ ['xlviii$', 'il'], ['viii$', 'ix'], ['iii$', 'iv'],
+        \ ['dcccxcix$', 'cm'], ['cccxcix$', 'cd'], ['lxxxix$', 'xc'],
+        \ ['xxxix$', 'xl'], ['\(i\{1,2\}\)$', '\1i'], ['cdxcix$', 'd'],
+        \ ['cmxcix$', 'm'], ['xcix$', 'c'], ['i\([vxlcdm]\)$', '\1'],
+        \ ['\([vxlcdm]\)$', '\1i'] ]
+  for [regex, subst] in subst_list
+    if a:value =~# regex
+      return substitute(a:value, regex, subst, '')
+    endif
+  endfor
+  return ''
+endfunction "}}}
+
+"incrementation functions for the various kinds of numbers }}}
+
+"utility functions {{{
+
+function! s:substitute_rx_in_line(lnum, pattern, new_string) "{{{
+  call setline(a:lnum, substitute(getline(a:lnum), a:pattern, a:new_string,
+        \ ''))
+endfunction "}}}
+
+function! s:substitute_string_in_line(lnum, old_string, new_string) "{{{
+  call s:substitute_rx_in_line(a:lnum, vimwiki#u#escape(a:old_string),
+        \ a:new_string)
+endfunction "}}}
+
+function! s:first_char(string) "{{{
+  return matchstr(a:string, '^.')
+endfunction "}}}
+
+if exists("*strdisplaywidth") "{{{
+  function! s:string_length(str)
+    return strdisplaywidth(a:str)
+  endfunction
+else
+  function! s:string_length(str)
+    return strlen(substitute(a:str, '.', 'x', 'g'))
+  endfunction
+endif "}}}
+
+function! vimwiki#lst#default_symbol() "{{{
+  return vimwiki#vars#get_syntaxlocal('list_markers')[0]
+endfunction "}}}
+
+function! vimwiki#lst#get_list_margin() "{{{
+  let list_margin = vimwiki#vars#get_wikilocal('list_margin')
+  if list_margin < 0
+    return &sw
+  else
+    return list_margin
+  endif
+endfunction "}}}
+
+"Returns: the column where the text of a line starts (possible list item
+"markers and checkboxes are skipped)
+function! s:text_begin(lnum) "{{{
+  return s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem')))
+endfunction "}}}
+
+"Returns: 2 if there is a marker and text
+" 1 for a marker and no text
+" 0 for no marker at all (empty line or only text)
+function! s:line_has_marker(lnum) "{{{
+  if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*$'
+    return 1
+  elseif getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*\S'
+    return 2
+  else
+    return 0
+  endif
+endfunction "}}}
+
+"utility functions }}}
+
+"get properties of an item {{{
+
+"Returns: the mainly used data structure in this file
+"An item represents a single list item and is a dictionary with the keys
+"lnum - the line number of the list item
+"type - 1 for bulleted item, 2 for numbered item, 0 for a regular line
+"mrkr - the concrete marker, e.g. '**' or 'b)'
+"cb   - the char in the checkbox or '' if there is no checkbox
+function! s:get_item(lnum) "{{{
+  let item = {'lnum': a:lnum}
+  if a:lnum == 0 || a:lnum > line('$')
+    let item.type = 0
+    return item
+  endif
+
+  let matches = matchlist(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem'))
+  if matches == [] ||
+        \ (matches[1] == '' && matches[2] == '') ||
+        \ (matches[1] != '' && matches[2] != '')
+    let item.type = 0
+    return item
+  endif
+
+  let item.cb = matches[3]
+
+  if matches[1] != ''
+    let item.type = 1
+    let item.mrkr = matches[1]
+  else
+    let item.type = 2
+    let item.mrkr = matches[2]
+  endif
+
+  return item
+endfunction "}}}
+
+function! s:empty_item() "{{{
+  return {'type': 0}
+endfunction "}}}
+
+"Returns: level of the line
+"0 is the 'highest' level
+function! s:get_level(lnum) "{{{
+  if getline(a:lnum) =~# '^\s*$'
+    return 0
+  endif
+  if !vimwiki#vars#get_syntaxlocal('recurring_bullets')
+    let level = indent(a:lnum)
+  else
+    let level = s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal(rx_bullet_chars)))-1
+    if level < 0
+      let level = (indent(a:lnum) == 0) ? 0 : 9999
+    endif
+  endif
+  return level
+endfunction "}}}
+
+"Returns: 1, a, i, A, I or ''
+"If in doubt if alphanumeric character or romanian
+"numeral, peek in the previous line
+function! s:guess_kind_of_numbered_item(item) "{{{
+  if a:item.type != 2 | return '' | endif
+  let number_chars = a:item.mrkr[:-2]
+  let divisor = a:item.mrkr[-1:]
+
+  let number_kinds = vimwiki#vars#get_syntaxlocal('number_kinds')
+
+  if number_chars =~# '\d\+'
+    return '1'
+  endif
+  if number_chars =~# '\l\+'
+    if number_chars !~# '^[ivxlcdm]\+' || index(number_kinds, 'i') == -1
+      return 'a'
+    else
+
+      let item_above = s:get_prev_list_item(a:item, 0)
+      if item_above.type != 0
+        if index(number_kinds, 'a') == -1 ||
+              \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'i\+') ||
+              \ s:increment_i(item_above.mrkr[:-2]) ==# number_chars
+          return 'i'
+        else
+          return 'a'
+        endif
+      else
+        if number_chars =~# 'i\+' || index(number_kinds, 'a') == -1
+          return 'i'
+        else
+          return 'a'
+        endif
+      endif
+
+    endif
+  endif
+  if number_chars =~# '\u\+'
+    if number_chars !~# '^[IVXLCDM]\+' || index(number_kinds, 'I') == -1
+      return 'A'
+    else
+
+      let item_above = s:get_prev_list_item(a:item, 0)
+      if item_above.type != 0
+        if index(number_kinds, 'A') == -1 ||
+              \ (item_above.mrkr[-1:] !=# divisor && number_chars =~# 'I\+') ||
+              \ s:increment_I(item_above.mrkr[:-2]) ==# number_chars
+          return 'I'
+        else
+          return 'A'
+        endif
+      else
+        if number_chars =~# 'I\+' || index(number_kinds, 'A') == -1
+          return 'I'
+        else
+          return 'A'
+        endif
+      endif
+
+    endif
+  endif
+endfunction "}}}
+
+function! s:regexp_of_marker(item) "{{{
+  if a:item.type == 1
+    return vimwiki#u#escape(a:item.mrkr)
+  elseif a:item.type == 2
+    let number_divisors = vimwiki#vars#get_syntaxlocal('number_divisors')
+    for ki in ['d', 'u', 'l']
+      let match = matchstr(a:item.mrkr, '\'.ki.'\+['.number_divisors.']')
+      if match != ''
+        return '\'.ki.'\+'.vimwiki#u#escape(match[-1:])
+      endif
+    endfor
+  else
+    return ''
+  endif
+endfunction "}}}
+
+"get properties of an item }}}
+
+"functions for navigating between items {{{
+
+"Returns: the list item after a:item or an empty item
+"If a:ignore_kind is 1, the markers can differ
+function! s:get_next_list_item(item, ignore_kind) "{{{
+  let org_lvl = s:get_level(a:item.lnum)
+  if !a:ignore_kind
+    let org_regex = s:regexp_of_marker(a:item)
+  endif
+
+  let cur_ln = s:get_next_line(a:item.lnum)
+  while cur_ln <= line('$')
+    let cur_lvl = s:get_level(cur_ln)
+    if cur_lvl <= org_lvl
+      if a:ignore_kind
+        return s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
+      else
+        return s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
+      endif
+    endif
+    let cur_ln = s:get_next_line(cur_ln)
+  endwhile
+  return s:empty_item()
+endfunction "}}}
+
+"Returns: the list item before a:item or an empty item
+"If a:ignore_kind is 1, the markers can differ
+function! s:get_prev_list_item(item, ignore_kind) "{{{
+  let org_lvl = s:get_level(a:item.lnum)
+  if !a:ignore_kind
+    let org_regex = s:regexp_of_marker(a:item)
+  endif
+
+  let cur_ln = s:get_prev_line(a:item.lnum)
+  while cur_ln >= 1
+    let cur_lvl = s:get_level(cur_ln)
+    if cur_lvl <= org_lvl
+      if a:ignore_kind
+        return s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
+      else
+        return s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
+      endif
+    endif
+    let cur_ln = s:get_prev_line(cur_ln)
+  endwhile
+  return s:empty_item()
+endfunction "}}}
+
+function! s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex) "{{{
+  let cur_linecontent = getline(a:cur_ln)
+  if a:cur_lvl == a:org_lvl
+    if cur_linecontent =~# '^\s*'.a:org_regex.'\s'
+      return s:get_item(a:cur_ln)
+    else
+      return s:empty_item()
+    endif
+  elseif a:cur_lvl < a:org_lvl
+    return s:empty_item()
+  endif
+endfunction "}}}
+
+function! s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl) "{{{
+  if a:cur_lvl == a:org_lvl
+    return s:get_item(a:cur_ln)
+  elseif a:cur_lvl < a:org_lvl
+    return s:empty_item()
+  endif
+endfunction "}}}
+
+function! s:get_first_item_in_list(item, ignore_kind) "{{{
+  let cur_item = a:item
+  while 1
+    let prev_item = s:get_prev_list_item(cur_item, a:ignore_kind)
+    if prev_item.type == 0
+      break
+    else
+      let cur_item = prev_item
+    endif
+  endwhile
+  return cur_item
+endfunction "}}}
+
+function! s:get_last_item_in_list(item, ignore_kind) "{{{
+  let cur_item = a:item
+  while 1
+    let next_item = s:get_next_list_item(cur_item, a:ignore_kind)
+    if next_item.type == 0
+      break
+    else
+      let cur_item = next_item
+    endif
+  endwhile
+  return cur_item
+endfunction "}}}
+
+"Returns: lnum+1 in most cases, but skips blank lines and preformatted text,
+"0 in case of nonvalid line.
+"If there is no second argument, 0 is returned at a header, otherwise the
+"header is skipped
+function! s:get_next_line(lnum, ...) "{{{
+  if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
+    let cur_ln = a:lnum + 1
+    while cur_ln <= line('$') &&
+          \ getline(cur_ln) !~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
+      let cur_ln += 1
+    endwhile
+    let next_line = cur_ln
+  else
+    let next_line = nextnonblank(a:lnum+1)
+  endif
+
+  if a:0 > 0 && getline(next_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader')
+    let next_line = s:get_next_line(next_line, 1)
+  endif
+
+  if next_line < 0 || next_line > line('$') ||
+        \ (getline(next_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader') && a:0 == 0)
+    return 0
+  endif
+
+  return next_line
+endfunction "}}}
+
+"Returns: lnum-1 in most cases, but skips blank lines and preformatted text
+"0 in case of nonvalid line and a header, because a header ends every list
+function! s:get_prev_line(lnum) "{{{
+  let prev_line = prevnonblank(a:lnum-1)
+
+  if getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
+    let cur_ln = a:lnum - 1
+    while 1
+      if cur_ln == 0 || getline(cur_ln) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
+        break
+      endif
+      let cur_ln -= 1
+    endwhile
+    let prev_line = cur_ln
+  endif
+
+  if prev_line < 0 || prev_line > line('$') ||
+        \ getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxHeader')
+    return 0
+  endif
+
+  return prev_line
+endfunction "}}}
+
+function! s:get_first_child(item) "{{{
+  if a:item.lnum >= line('$')
+    return s:empty_item()
+  endif
+  let org_lvl = s:get_level(a:item.lnum)
+  let cur_item = s:get_item(s:get_next_line(a:item.lnum))
+  while 1
+    if cur_item.type != 0 && s:get_level(cur_item.lnum) > org_lvl
+      return cur_item
+    endif
+    if cur_item.lnum > line('$') || cur_item.lnum <= 0 ||
+          \ s:get_level(cur_item.lnum) <= org_lvl
+      return s:empty_item()
+    endif
+    let cur_item = s:get_item(s:get_next_line(cur_item.lnum))
+  endwhile
+endfunction "}}}
+
+
+"Returns: the next sibling of a:child, given the parent item
+"Used for iterating over children
+"Note: child items do not necessarily have the same indent, i.e. level
+function! s:get_next_child_item(parent, child) "{{{
+  if a:parent.type == 0 | return s:empty_item() | endif
+  let parent_lvl = s:get_level(a:parent.lnum)
+  let cur_ln = s:get_last_line_of_item_incl_children(a:child)
+  while 1
+    let next_line = s:get_next_line(cur_ln)
+    if next_line == 0 || s:get_level(next_line) <= parent_lvl
+      break
+    endif
+    let cur_ln = next_line
+    let cur_item = s:get_item(cur_ln)
+    if cur_item.type > 0
+      return cur_item
+    endif
+  endwhile
+  return s:empty_item()
+endfunction "}}}
+
+function! s:get_parent(item) "{{{
+  let parent_line = 0
+
+  let cur_ln = prevnonblank(a:item.lnum)
+  let child_lvl = s:get_level(cur_ln)
+  if child_lvl == 0
+    return s:empty_item()
+  endif
+
+  while 1
+    let cur_ln = s:get_prev_line(cur_ln)
+    if cur_ln == 0 | break | endif
+    let cur_lvl = s:get_level(cur_ln)
+    if cur_lvl < child_lvl
+      let cur_item = s:get_item(cur_ln)
+      if cur_item.type == 0
+        let child_lvl = cur_lvl
+        continue
+      endif
+      let parent_line = cur_ln
+      break
+    endif
+  endwhile
+  return s:get_item(parent_line)
+endfunction "}}}
+
+"Returns: the item above or the item below or an empty item
+function! s:get_a_neighbor_item(item) "{{{
+  let prev_item = s:get_prev_list_item(a:item, 1)
+  if prev_item.type != 0
+    return prev_item
+  else
+    let next_item = s:get_next_list_item(a:item, 1)
+    if next_item.type != 0
+      return next_item
+    endif
+  endif
+  return s:empty_item()
+endfunction "}}}
+
+function! s:get_a_neighbor_item_in_column(lnum, column) "{{{
+  let cur_ln = s:get_prev_line(a:lnum)
+  while cur_ln >= 1
+    if s:get_level(cur_ln) <= a:column
+      return s:get_corresponding_item(cur_ln)
+    endif
+    let cur_ln = s:get_prev_line(cur_ln)
+  endwhile
+  return s:empty_item()
+endfunction "}}}
+
+"Returns: the item if there is one in a:lnum
+"else the multiline item a:lnum belongs to
+function! s:get_corresponding_item(lnum) "{{{
+  let item = s:get_item(a:lnum)
+  if item.type != 0
+    return item
+  endif
+  let org_lvl = s:get_level(a:lnum)
+  let cur_ln = a:lnum
+  while cur_ln > 0
+    let cur_lvl = s:get_level(cur_ln)
+    let cur_item = s:get_item(cur_ln)
+    if cur_lvl < org_lvl && cur_item.type != 0
+      return cur_item
+    endif
+    if cur_lvl < org_lvl
+      let org_lvl = cur_lvl
+    endif
+    let cur_ln = s:get_prev_line(cur_ln)
+  endwhile
+  return s:empty_item()
+endfunction "}}}
+
+"Returns: the last line of a (possibly multiline) item, including all children
+function! s:get_last_line_of_item_incl_children(item) "{{{
+  let cur_ln = a:item.lnum
+  let org_lvl = s:get_level(a:item.lnum)
+  while 1
+    let next_line = s:get_next_line(cur_ln)
+    if next_line == 0 || s:get_level(next_line) <= org_lvl
+      return cur_ln
+    endif
+    let cur_ln = next_line
+  endwhile
+endfunction "}}}
+
+"Returns: the last line of a (possibly multiline) item
+"Note: there can be other list items between the first and last line
+function! s:get_last_line_of_item(item) "{{{
+  if a:item.type == 0 | return 0 | endif
+  let org_lvl = s:get_level(a:item.lnum)
+  let last_corresponding_line = a:item.lnum
+
+  let cur_ln = s:get_next_line(a:item.lnum)
+  while 1
+    if cur_ln == 0 || s:get_level(cur_ln) <= org_lvl
+      break
+    endif
+    let cur_item = s:get_item(cur_ln)
+    if cur_item.type == 0
+      let last_corresponding_line = cur_ln
+      let cur_ln = s:get_next_line(cur_ln)
+    else
+      let cur_ln = s:get_next_line(
+            \ s:get_last_line_of_item_incl_children(cur_item))
+    endif
+  endwhile
+
+  return last_corresponding_line
+endfunction "}}}
+
+"functions for navigating between items }}}
+
+"renumber list items {{{
+"Renumbers the current list from a:item on downwards
+"Returns: the last item that was adjusted
+function! s:adjust_numbered_list_below(item, recursive) "{{{
+  if !(a:item.type == 2 || (a:item.type == 1 && a:recursive))
+    return a:item
+  endif
+
+  let kind = s:guess_kind_of_numbered_item(a:item)
+
+  let cur_item = a:item
+  while 1
+    if a:recursive
+      call s:adjust_items_recursively(cur_item)
+    endif
+
+    let next_item = s:get_next_list_item(cur_item, 0)
+    if next_item.type == 0
+      break
+    endif
+
+    if cur_item.type == 2
+      let new_val = s:increment_{kind}(cur_item.mrkr[:-2]) . cur_item.mrkr[-1:]
+      call s:substitute_string_in_line(next_item.lnum, next_item.mrkr, new_val)
+      let next_item.mrkr = new_val
+    endif
+
+    let cur_item = next_item
+  endwhile
+  return cur_item
+endfunction "}}}
+
+function! s:adjust_items_recursively(parent) "{{{
+  if a:parent.type == 0
+    return s:empty_item()
+  end
+
+  let child_item = s:get_first_child(a:parent)
+  if child_item.type == 0
+    return child_item
+  endif
+  while 1
+    let last_item = s:adjust_numbered_list(child_item, 1, 1)
+
+    let child_item = s:get_next_child_item(a:parent, last_item)
+    if child_item.type == 0
+      return last_item
+    endif
+  endwhile
+endfunction "}}}
+
+"Renumbers the list a:item is in.
+"If a:ignore_kind == 0, only the items which have the same kind of marker as
+"a:item are considered, otherwise all items.
+"Returns: the last item that was adjusted
+function! s:adjust_numbered_list(item, ignore_kind, recursive) "{{{
+  if !(a:item.type == 2 || (a:item.type == 1 && (a:ignore_kind || a:recursive)))
+    return s:empty_item()
+  end
+
+  let first_item = s:get_first_item_in_list(a:item, a:ignore_kind)
+
+  while 1
+    if first_item.type == 2
+      let new_mrkr = s:guess_kind_of_numbered_item(first_item) .
+            \ first_item.mrkr[-1:]
+      call s:substitute_string_in_line(first_item.lnum, first_item.mrkr,
+            \ new_mrkr)
+      let first_item.mrkr = new_mrkr
+    endif
+
+    let last_item = s:adjust_numbered_list_below(first_item, a:recursive)
+
+    let next_first_item = s:get_next_list_item(last_item, 1)
+    if a:ignore_kind == 0 || next_first_item.type == 0
+      return last_item
+    endif
+    let first_item = next_first_item
+  endwhile
+endfunction "}}}
+
+"Renumbers the list the cursor is in
+"also update its parents checkbox state
+function! vimwiki#lst#adjust_numbered_list() "{{{
+  let cur_item = s:get_corresponding_item(line('.'))
+  if cur_item.type == 0 | return | endif
+  call s:adjust_numbered_list(cur_item, 1, 0)
+  call s:update_state(s:get_parent(cur_item))
+endfunction "}}}
+
+"Renumbers all lists of the buffer
+"of course, this might take some seconds
+function! vimwiki#lst#adjust_whole_buffer() "{{{
+  let cur_ln = 1
+  while 1
+    let cur_item = s:get_item(cur_ln)
+    if cur_item.type != 0
+      let cur_item = s:adjust_numbered_list(cur_item, 0, 1)
+    endif
+    let cur_ln = s:get_next_line(cur_item.lnum, 1)
+    if cur_ln <= 0 || cur_ln > line('$')
+      return
+    endif
+  endwhile
+endfunction "}}}
+
+"renumber list items }}}
+
+"checkbox stuff {{{
+
+"Returns: the rate of checkboxed list item in percent
+function! s:get_rate(item) "{{{
+  if a:item.type == 0 || a:item.cb == ''
+    return -1
+  endif
+  let state = a:item.cb
+  if state == vimwiki#vars#get_global('listsym_rejected')
+    return -1
+  endif
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 100/(n-1)
+endfunction "}}}
+
+"Set state of the list item to [ ] or [o] or whatever
+"Returns: 1 if the state changed, 0 otherwise
+function! s:set_state(item, new_rate) "{{{
+  let new_state = s:rate_to_state(a:new_rate)
+  let old_state = s:rate_to_state(s:get_rate(a:item))
+  if new_state !=# old_state
+    call s:substitute_rx_in_line(a:item.lnum, '\[.]', '['.new_state.']')
+    return 1
+  else
+    return 0
+  endif
+endfunction "}}}
+
+"Set state of the list item to [ ] or [o] or whatever
+"Updates the states of its child items
+function! s:set_state_plus_children(item, new_rate) "{{{
+  call s:set_state(a:item, a:new_rate)
+
+  let child_item = s:get_first_child(a:item)
+  while 1
+    if child_item.type == 0
+      break
+    endif
+    if child_item.cb != ''
+      call s:set_state_plus_children(child_item, a:new_rate)
+    endif
+    let child_item = s:get_next_child_item(a:item, child_item)
+  endwhile
+endfunction "}}}
+
+"Returns: the appropriate symbol for a given percent rate
+function! s:rate_to_state(rate) "{{{
+  let listsyms_list = vimwiki#vars#get_syntaxlocal('listsyms_list')
+  let state = ''
+  let n = len(listsyms_list)
+  if a:rate == 100
+    let state = listsyms_list[n-1]
+  elseif a:rate == 0
+    let state = listsyms_list[0]
+  elseif a:rate == -1
+    let state = vimwiki#vars#get_global('listsym_rejected')
+  else
+    let index = float2nr(ceil(a:rate/100.0*(n-2)))
+    let state = listsyms_list[index]
+  endif
+  return state
+endfunction "}}}
+
+"updates the symbol of a checkboxed item according to the symbols of its
+"children
+function! s:update_state(item) "{{{
+  if a:item.type == 0 || a:item.cb == ''
+    return
+  endif
+
+  let sum_children_rate = 0
+  let count_children_with_cb = 0
+
+  let child_item = s:get_first_child(a:item)
+
+  while 1
+    if child_item.type == 0
+      break
+    endif
+    if child_item.cb != ''
+      let rate = s:get_rate(child_item)
+      if rate != -1
+        let count_children_with_cb += 1
+        let sum_children_rate += rate
+      endif
+    endif
+    let child_item = s:get_next_child_item(a:item, child_item)
+  endwhile
+
+  if count_children_with_cb > 0
+    let new_rate = sum_children_rate / count_children_with_cb
+    call s:set_state_recursively(a:item, new_rate)
+  else
+    let rate = s:get_rate(a:item)
+    if rate > 0 && rate < 100
+      call s:set_state_recursively(a:item, 0)
+    endif
+  endif
+endfunction "}}}
+
+function! s:set_state_recursively(item, new_rate) "{{{
+  let state_changed = s:set_state(a:item, a:new_rate)
+  if state_changed
+    call s:update_state(s:get_parent(a:item))
+  endif
+endfunction "}}}
+
+"Creates checkbox in a list item.
+"Returns: 1 if successful
+function! s:create_cb(item) "{{{
+  if a:item.type == 0 || a:item.cb != ''
+    return 0
+  endif
+
+  let new_item = a:item
+  let new_item.cb = vimwiki#vars#get_syntaxlocal('listsyms_list')[0]
+  call s:substitute_rx_in_line(new_item.lnum,
+        \ vimwiki#u#escape(new_item.mrkr) . '\zs\ze', ' [' . new_item.cb . ']')
+
+  call s:update_state(new_item)
+  return 1
+endfunction "}}}
+
+function! s:remove_cb(item) "{{{
+  let item = a:item
+  if item.type != 0 && item.cb != ''
+    let item.cb = ''
+    call s:substitute_rx_in_line(item.lnum, '\s\+\[.\]', '')
+  endif
+  return item
+endfunction "}}}
+
+"Change state of checkbox
+"in the lines of the given range
+function! s:change_cb(from_line, to_line, new_rate) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  let parent_items_of_lines = []
+
+  for cur_ln in range(from_item.lnum, a:to_line)
+    let cur_item = s:get_item(cur_ln)
+    if cur_item.type != 0 && cur_item.cb != ''
+      call s:set_state_plus_children(cur_item, a:new_rate)
+      let cur_parent_item = s:get_parent(cur_item)
+      if index(parent_items_of_lines, cur_parent_item) == -1
+        call insert(parent_items_of_lines, cur_parent_item)
+      endif
+    endif
+  endfor
+
+  for parent_item in parent_items_of_lines
+    call s:update_state(parent_item)
+  endfor
+
+endfunction "}}}
+
+"Toggles checkbox between two states in the lines of the given range,
+"creates chceckboxes if there aren't any.
+function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  if from_item.cb == ''
+
+    "if from_line has no CB, make a CB in every selected line
+    let parent_items_of_lines = []
+    for cur_ln in range(from_item.lnum, a:to_line)
+      let cur_item = s:get_item(cur_ln)
+      let success = s:create_cb(cur_item)
+
+      if success
+        let cur_parent_item = s:get_parent(cur_item)
+        if index(parent_items_of_lines, cur_parent_item) == -1
+          call insert(parent_items_of_lines, cur_parent_item)
+        endif
+      endif
+    endfor
+
+    for parent_item in parent_items_of_lines
+      call s:update_state(parent_item)
+    endfor
+
+  else
+
+    "if from_line has CB, toggle it and set all siblings to the same new state
+    let rate_first_line = s:get_rate(from_item)
+    let new_rate = rate_first_line == a:state1 ? a:state2 : a:state1
+
+    call s:change_cb(a:from_line, a:to_line, new_rate)
+
+  endif
+
+endfunction "}}}
+
+"Decrement checkbox between [ ] and [X]
+"in the lines of the given range
+function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  "if from_line has CB, decrement it and set all siblings to the same new state
+  let rate_first_line = s:get_rate(from_item)
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  let new_rate = max([rate_first_line - 100/(n-1)-1, 0])
+
+  call s:change_cb(a:from_line, a:to_line, new_rate)
+
+endfunction "}}}
+
+"Increment checkbox between [ ] and [X]
+"in the lines of the given range
+function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  "if from_line has CB, increment it and set all siblings to the same new state
+  let rate_first_line = s:get_rate(from_item)
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  let new_rate = min([rate_first_line + 100/(n-1)+1, 100])
+
+  call s:change_cb(a:from_line, a:to_line, new_rate)
+
+endfunction "}}}
+
+"Toggles checkbox between [ ] and [X] or creates one
+"in the lines of the given range
+function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
+  return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
+endfunction "}}}
+
+"Toggles checkbox between [ ] and [-] or creates one
+"in the lines of the given range
+function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
+  return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
+endfunction "}}}
+
+"Increment checkbox between [ ] and [X]
+"in the lines of the given range
+function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    return
+  endif
+
+  "if from_line has CB, increment it and set all siblings to the same new state
+  let rate_first_line = s:get_rate(from_item)
+  let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
+  let new_rate = min([rate_first_line + 100/(n-1)+1, 100])
+
+  call s:change_cb(a:from_line, a:to_line, new_rate)
+
+endfunction "}}}
+
+"Toggles checkbox between [ ] and [X] or creates one
+"in the lines of the given range
+function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
+  return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
+endfunction "}}}
+
+"Toggles checkbox between [ ] and [-] or creates one
+"in the lines of the given range
+function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
+  return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
+endfunction "}}}
+
+function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
+  let first_item = s:get_corresponding_item(a:first_line)
+  let last_item = s:get_corresponding_item(a:last_line)
+
+  if first_item.type == 0 || last_item.type == 0
+    return
+  endif
+
+  let parent_items_of_lines = []
+  let cur_ln = first_item.lnum
+  while 1
+    if cur_ln <= 0 || cur_ln > last_item.lnum | break | endif
+    let cur_item = s:get_item(cur_ln)
+    if cur_item.type != 0
+      let cur_item = s:remove_cb(cur_item)
+      let cur_parent_item = s:get_parent(cur_item)
+      if index(parent_items_of_lines, cur_parent_item) == -1
+        call insert(parent_items_of_lines, cur_parent_item)
+      endif
+    endif
+    let cur_ln = s:get_next_line(cur_ln)
+  endwhile
+  for parent_item in parent_items_of_lines
+    call s:update_state(parent_item)
+  endfor
+endfunction "}}}
+
+function! vimwiki#lst#remove_cb_in_list() "{{{
+  let first_item = s:get_first_item_in_list(
+        \ s:get_corresponding_item(line('.')), 0)
+
+  let cur_item = first_item
+  while 1
+    let next_item = s:get_next_list_item(cur_item, 0)
+    let cur_item = s:remove_cb(cur_item)
+    if next_item.type == 0
+      break
+    else
+      let cur_item = next_item
+    endif
+  endwhile
+
+  call s:update_state(s:get_parent(first_item))
+endfunction "}}}
+
+"checkbox stuff }}}
+
+"change the level of list items {{{
+
+function! s:set_indent(lnum, new_indent) "{{{
+  if &expandtab
+    let indentstring = repeat(' ', a:new_indent)
+  else
+    let indentstring = repeat('\t', a:new_indent / &tabstop) .
+          \ repeat(' ', a:new_indent % &tabstop)
+  endif
+  call s:substitute_rx_in_line(a:lnum, '^\s*', indentstring)
+endfunction "}}}
+
+function! s:decrease_level(item) "{{{
+  let removed_indent = 0
+  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
+    if s:string_length(a:item.mrkr) >= 2
+      call s:substitute_string_in_line(a:item.lnum,
+            \ s:first_char(a:item.mrkr), '')
+      let removed_indent = -1
+    endif
+  else
+    let old_indent = indent(a:item.lnum)
+    if &shiftround
+      let new_indent = (old_indent - 1) / vimwiki#u#sw() * vimwiki#u#sw()
+    else
+      let new_indent = old_indent - vimwiki#u#sw()
+    endif
+    call s:set_indent(a:item.lnum, new_indent)
+    let removed_indent = new_indent - old_indent
+  endif
+  return removed_indent
+endfunction "}}}
+
+function! s:increase_level(item) "{{{
+  let additional_indent = 0
+  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
+    call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:item.mrkr .
+          \ s:first_char(a:item.mrkr))
+    let additional_indent = 1
+  else
+    let old_indent = indent(a:item.lnum)
+    if &shiftround
+      let new_indent = (old_indent / vimwiki#u#sw() + 1) * vimwiki#u#sw()
+    else
+      let new_indent = old_indent + vimwiki#u#sw()
+    endif
+    call s:set_indent(a:item.lnum, new_indent)
+    let additional_indent = new_indent - old_indent
+  endif
+  return additional_indent
+endfunction "}}}
+
+"adds a:indent_by to the current indent
+"a:indent_by can be negative
+function! s:indent_line_by(lnum, indent_by) "{{{
+  let item = s:get_item(a:lnum)
+  if vimwiki#vars#get_syntaxlocal('recurring_bullets') && item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(item.mrkr)) > -1
+    if a:indent_by > 0
+      call s:substitute_string_in_line(a:lnum, item.mrkr,
+            \ item.mrkr . s:first_char(item.mrkr))
+    elseif a:indent_by < 0
+      call s:substitute_string_in_line(a:lnum, s:first_char(item.mrkr), '')
+    endif
+  else
+    call s:set_indent(a:lnum, indent(a:lnum) + a:indent_by)
+  endif
+endfunction "}}}
+
+"changes lvl of lines in selection
+function! s:change_level(from_line, to_line, direction, plus_children) "{{{
+  let from_item = s:get_corresponding_item(a:from_line)
+  if from_item.type == 0
+    if a:direction ==# 'increase' && a:from_line == a:to_line &&
+          \ empty(getline(a:from_line))
+      "that's because :> doesn't work on an empty line
+      normal! gi
+    else
+      execute a:from_line.','.a:to_line.(a:direction ==# 'increase' ? '>' : '<')
+    endif
+    return
+  endif
+
+  if a:direction ==# 'decrease' && s:get_level(from_item.lnum) == 0
+    return
+  endif
+
+  if a:from_line == a:to_line
+    if a:plus_children
+      let to_line = s:get_last_line_of_item_incl_children(from_item)
+    else
+      let to_line = s:get_last_line_of_item(from_item)
+    endif
+  else
+    let to_item = s:get_corresponding_item(a:to_line)
+    if to_item.type == 0
+      let to_line = a:to_line
+    else
+      if a:plus_children
+        let to_line = s:get_last_line_of_item_incl_children(to_item)
+      else
+        let to_line = s:get_last_line_of_item(to_item)
+      endif
+    endif
+  endif
+
+  if to_line == 0
+    return
+  endif
+
+  let to_be_adjusted = s:get_a_neighbor_item(from_item)
+  let old_parent = s:get_parent(from_item)
+  let first_line_level = s:get_level(from_item.lnum)
+  let more_than_one_level_concerned = 0
+
+  let first_line_indented_by =
+        \ (a:direction ==# 'increase') ?
+        \ s:increase_level(from_item) : s:decrease_level(from_item)
+
+  let cur_ln = s:get_next_line(from_item.lnum)
+  while cur_ln > 0 && cur_ln <= to_line
+    if !more_than_one_level_concerned &&
+          \ s:get_level(cur_ln) != first_line_level &&
+          \ s:get_item(cur_ln).type != 0
+      let more_than_one_level_concerned = 1
+    endif
+    call s:indent_line_by(cur_ln, first_line_indented_by)
+    let cur_ln = s:get_next_line(cur_ln, 1)
+  endwhile
+
+  if a:from_line == a:to_line
+    call s:adjust_mrkr(from_item)
+  endif
+  call s:update_state(old_parent)
+  let from_item = s:get_item(from_item.lnum)
+  if from_item.cb != ''
+    call s:update_state(from_item)
+    call s:update_state(s:get_parent(from_item))
+  endif
+
+  if more_than_one_level_concerned
+    call vimwiki#lst#adjust_whole_buffer()
+  else
+    call s:adjust_numbered_list(from_item, 0, 0)
+    call s:adjust_numbered_list(to_be_adjusted, 0, 0)
+  endif
+endfunction "}}}
+
+function! vimwiki#lst#change_level(from_line, to_line, direction, plus_children) "{{{
+  let cur_col = col('$') - col('.')
+  call s:change_level(a:from_line, a:to_line, a:direction, a:plus_children)
+  call cursor('.', col('$') - cur_col)
+endfunction "}}}
+
+"indent line a:lnum to be the continuation of a:prev_item
+function! s:indent_multiline(prev_item, lnum) "{{{
+  if a:prev_item.type != 0
+    call s:set_indent(a:lnum, s:text_begin(a:prev_item.lnum))
+  endif
+endfunction "}}}
+
+"change the level of list items }}}
+
+"change markers of list items {{{
+"Returns: the position of a marker in g:vimwiki_list_markers
+function! s:get_idx_list_markers(item) "{{{
+  if a:item.type == 1
+    let m = s:first_char(a:item.mrkr)
+  else
+    let m = s:guess_kind_of_numbered_item(a:item) . a:item.mrkr[-1:]
+  endif
+  return index(vimwiki#vars#get_syntaxlocal('list_markers'), m)
+endfunction "}}}
+
+"changes the marker of the given item to the next in g:vimwiki_list_markers
+function! s:get_next_mrkr(item) "{{{
+  let markers = vimwiki#vars#get_syntaxlocal('list_markers')
+  if a:item.type == 0
+    let new_mrkr = markers[0]
+  else
+    let idx = s:get_idx_list_markers(a:item)
+    let new_mrkr = markers[(idx+1) % len(markers)]
+  endif
+  return new_mrkr
+endfunction "}}}
+
+"changes the marker of the given item to the previous in g:vimwiki_list_markers
+function! s:get_prev_mrkr(item) "{{{
+  let markers = vimwiki#vars#get_syntaxlocal('list_markers')
+  if a:item.type == 0
+    return markers[-1]
+  endif
+  let idx = s:get_idx_list_markers(a:item)
+  if idx == -1
+    return markers[-1]
+  else
+    return markers[(idx - 1 + len(markers)) %
+          \ len(markers)]
+  endif
+endfunction "}}}
+
+function! s:set_new_mrkr(item, new_mrkr) "{{{
+  if a:item.type == 0
+    call s:substitute_rx_in_line(a:item.lnum, '^\s*\zs\ze', a:new_mrkr.' ')
+    if indent(a:item.lnum) == 0 && !vimwiki#vars#get_syntaxlocal('recurring_bullets')
+      call s:set_indent(a:item.lnum, vimwiki#lst#get_list_margin())
+    endif
+  else
+    call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:new_mrkr)
+  endif
+endfunction "}}}
+
+function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
+  let cur_col_from_eol = col("$") - (a:mode ==# "i" ? col("'^") : col('.'))
+  let new_mrkr = a:new_mrkr
+  let cur_ln = a:from_line
+  while 1
+    let cur_item = s:get_item(cur_ln)
+
+    if new_mrkr ==# "next"
+      let new_mrkr = s:get_next_mrkr(cur_item)
+    elseif new_mrkr ==# "prev"
+      let new_mrkr = s:get_prev_mrkr(cur_item)
+    endif
+
+    "handle markers like ***
+    if index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(new_mrkr)) > -1
+      "use *** if the item above has *** too
+      let item_above = s:get_prev_list_item(cur_item, 1)
+      if item_above.type == 1 &&
+            \ s:first_char(item_above.mrkr) ==# s:first_char(new_mrkr)
+        let new_mrkr = item_above.mrkr
+      else
+        "use *** if the item below has *** too
+        let item_below = s:get_next_list_item(cur_item, 1)
+        if item_below.type == 1 &&
+              \ s:first_char(item_below.mrkr) ==# s:first_char(new_mrkr)
+          let new_mrkr = item_below.mrkr
+        else
+          "if the old is ### and the new is * use ***
+          if cur_item.type == 1 &&
+                \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(cur_item.mrkr))>-1
+            let new_mrkr = repeat(new_mrkr, s:string_length(cur_item.mrkr))
+          else
+            "use *** if the parent item has **
+            let parent_item = s:get_parent(cur_item)
+            if parent_item.type == 1 &&
+                  \ s:first_char(parent_item.mrkr) ==# s:first_char(new_mrkr)
+              let new_mrkr = repeat(s:first_char(parent_item.mrkr),
+                    \ s:string_length(parent_item.mrkr)+1)
+            endif
+          endif
+        endif
+      endif
+
+    endif
+
+    call s:set_new_mrkr(cur_item, new_mrkr)
+    call s:adjust_numbered_list(s:get_item(cur_ln), 1, 0)
+
+    if cur_ln >= a:to_line | break | endif
+    let cur_ln = s:get_next_line(cur_ln, 1)
+  endwhile
+
+  call cursor('.', col('$') - cur_col_from_eol)
+endfunction "}}}
+
+function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{
+  let cur_item = s:get_corresponding_item(line('.'))
+  let first_item = s:get_first_item_in_list(cur_item, 0)
+  let last_item = s:get_last_item_in_list(cur_item, 0)
+  if first_item.type == 0 || last_item.type == 0 | return | endif
+  let first_item_line = first_item.lnum
+
+  let cur_item = first_item
+  while cur_item.type != 0 && cur_item.lnum <= last_item.lnum
+    call s:set_new_mrkr(cur_item, a:new_mrkr)
+    let cur_item = s:get_next_list_item(cur_item, 1)
+  endwhile
+
+  call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0)
+endfunction "}}}
+
+"sets kind of the item depending on neighbor items and the parent item
+function! s:adjust_mrkr(item) "{{{
+  if a:item.type == 0 || vimwiki#vars#get_syntaxlocal('recurring_bullets')
+    return
+  endif
+
+  let new_mrkr = a:item.mrkr
+  let neighbor_item = s:get_a_neighbor_item(a:item)
+  if neighbor_item.type != 0
+    let new_mrkr = neighbor_item.mrkr
+  endif
+
+  "if possible, set e.g. *** if parent has ** as marker
+  if neighbor_item.type == 0 && a:item.type == 1 &&
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
+    let parent_item = s:get_parent(a:item)
+    if parent_item.type == 1 &&
+          \ s:first_char(parent_item.mrkr) ==# s:first_char(a:item.mrkr)
+      let new_mrkr = repeat(s:first_char(parent_item.mrkr),
+            \ s:string_length(parent_item.mrkr)+1)
+    endif
+  endif
+
+  call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, new_mrkr)
+  call s:adjust_numbered_list(a:item, 0, 1)
+endfunction "}}}
+
+function! s:clone_marker_from_to(from, to) "{{{
+  let item_from = s:get_item(a:from)
+  if item_from.type == 0 | return | endif
+  let new_mrkr = item_from.mrkr . ' '
+  call s:substitute_rx_in_line(a:to, '^\s*', new_mrkr)
+  let new_indent = ( vimwiki#vars#get_syntaxlocal('recurring_bullets') ? 0 : indent(a:from) )
+  call s:set_indent(a:to, new_indent)
+  if item_from.cb != ''
+    call s:create_cb(s:get_item(a:to))
+    call s:update_state(s:get_parent(s:get_item(a:to)))
+  endif
+  if item_from.type == 2
+    let adjust_from = ( a:from < a:to ? a:from : a:to )
+    call s:adjust_numbered_list_below(s:get_item(adjust_from), 0)
+  endif
+endfunction "}}}
+
+function! s:remove_mrkr(item) "{{{
+  let item = a:item
+  if item.cb != ''
+    let item = s:remove_cb(item)
+    let parent_item = s:get_parent(item)
+  else
+    let parent_item = s:empty_item()
+  endif
+  call s:substitute_rx_in_line(item.lnum, vimwiki#u#escape(item.mrkr).'\s*', '')
+  call remove(item, 'mrkr')
+  call remove(item, 'cb')
+  let item.type = 0
+  call s:update_state(parent_item)
+  return item
+endfunction "}}}
+
+function! s:create_marker(lnum) "{{{
+  let new_sibling = s:get_corresponding_item(a:lnum)
+  if new_sibling.type == 0
+    let new_sibling = s:get_a_neighbor_item_in_column(a:lnum, virtcol('.'))
+  endif
+  if new_sibling.type != 0
+    call s:clone_marker_from_to(new_sibling.lnum, a:lnum)
+  else
+    let cur_item = s:get_item(a:lnum)
+    call s:set_new_mrkr(cur_item, vimwiki#vars#get_syntaxlocal('list_markers')[0])
+    call s:adjust_numbered_list(cur_item, 0, 0)
+  endif
+endfunction "}}}
+
+"change markers of list items }}}
+
+"handle keys {{{
+function! vimwiki#lst#kbd_o() "{{{
+  let fold_end = foldclosedend('.')
+  let lnum = (fold_end == -1) ? line('.') : fold_end
+  let cur_item = s:get_item(lnum)
+  "inserting and deleting the x is necessary
+  "because otherwise the indent is lost
+  normal! ox
+  if cur_item.lnum < s:get_last_line_of_item(cur_item)
+    call s:indent_multiline(cur_item, cur_item.lnum+1)
+  else
+    call s:clone_marker_from_to(cur_item.lnum, cur_item.lnum+1)
+  endif
+  startinsert!
+endfunction "}}}
+
+function! vimwiki#lst#kbd_O() "{{{
+  normal! Ox
+  let cur_ln = line('.')
+  if getline(cur_ln+1) !~# '^\s*$'
+    call s:clone_marker_from_to(cur_ln+1, cur_ln)
+  else
+    call s:clone_marker_from_to(cur_ln-1, cur_ln)
+  endif
+  startinsert!
+endfunction "}}}
+
+function! s:cr_on_empty_list_item(lnum, behavior) "{{{
+  if a:behavior == 1
+    "just make a new list item
+    normal! gi
+
+    call s:clone_marker_from_to(a:lnum, a:lnum+1)
+    startinsert!
+    return
+  elseif a:behavior == 2
+    "insert new marker but remove marker in old line
+    call append(a:lnum-1, '')
+    startinsert!
+    return
+  elseif a:behavior == 3
+    "list is finished, but cursor stays in current line
+    let item = s:get_item(a:lnum)
+    let neighbor_item = s:get_a_neighbor_item(item)
+    let child_item = s:get_first_child(item)
+    let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
+    normal! "_cc
+    call s:adjust_numbered_list(neighbor_item, 0, 0)
+    call s:adjust_numbered_list(child_item, 0, 0)
+    call s:update_state(parent_item)
+    startinsert
+    return
+  elseif a:behavior == 4
+    "list is finished, but cursor goes to next line
+    let item = s:get_item(a:lnum)
+    let neighbor_item = s:get_a_neighbor_item(item)
+    let child_item = s:get_first_child(item)
+    let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
+    normal! "_cc
+    call s:adjust_numbered_list(neighbor_item, 0, 0)
+    call s:adjust_numbered_list(child_item, 0, 0)
+    call s:update_state(parent_item)
+    startinsert
+    return
+  elseif a:behavior == 5
+    "successively decrease level
+    if s:get_level(a:lnum) > 0
+      call s:change_level(a:lnum, a:lnum, 'decrease', 0)
+      startinsert!
+    else
+      let item = s:get_item(a:lnum)
+      let neighbor_item = s:get_a_neighbor_item(item)
+      let child_item = s:get_first_child(item)
+      let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
+      normal! "_cc
+      call s:adjust_numbered_list(neighbor_item, 0, 0)
+      call s:adjust_numbered_list(child_item, 0, 0)
+      call s:update_state(parent_item)
+      startinsert
+    endif
+    return
+  endif
+endfunction "}}}
+
+function! s:cr_on_empty_line(lnum, behavior) "{{{
+  "inserting and deleting the x is necessary
+  "because otherwise the indent is lost
+  normal! gi
+x
+  if a:behavior == 2 || a:behavior == 3
+    call s:create_marker(a:lnum+1)
+  endif
+endfunction "}}}
+
+function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
+  if a:insert_new_marker
+    "the ultimate feature of this script: make new marker on <CR>
+    normal! gi
+
+    call s:clone_marker_from_to(a:lnum, a:lnum+1)
+    "tiny sweet extra feature: indent next line if current line ends with :
+    if !a:not_at_eol && getline(a:lnum) =~# ':$'
+      call s:change_level(a:lnum+1, a:lnum+1, 'increase', 0)
+    endif
+  else
+    " || (cur_item.lnum < s:get_last_line_of_item(cur_item))
+    "indent this line so that it becomes the continuation of the line above
+    normal! gi
+
+    let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
+    call s:indent_multiline(prev_line, a:lnum+1)
+  endif
+endfunction "}}}
+
+function! vimwiki#lst#kbd_cr(normal, just_mrkr) "{{{
+  let lnum = line('.')
+  let has_bp = s:line_has_marker(lnum)
+
+  if has_bp != 0 && virtcol('.') < s:text_begin(lnum)
+    call append(lnum-1, '')
+    startinsert!
+    return
+  endif
+
+  if has_bp == 1
+    call s:cr_on_empty_list_item(lnum, a:just_mrkr)
+    return
+  endif
+
+  let insert_new_marker = (a:normal == 1 || a:normal == 3)
+  if getline('.')[col("'^")-1:] =~# '^\s\+$'
+    let cur_col = 0
+  else
+    let cur_col = col("$") - col("'^")
+    if getline('.')[col("'^")-1] =~# '\s' && exists("*strdisplaywidth")
+      let ws_behind_cursor =
+            \ strdisplaywidth(matchstr(getline('.')[col("'^")-1:], '\s\+'),
+            \ virtcol("'^")-1)
+      let cur_col -= ws_behind_cursor
+    endif
+    if insert_new_marker && cur_col == 0 && getline(lnum) =~# '\s$'
+      let insert_new_marker = 0
+    endif
+  endif
+
+  if has_bp == 0
+    call s:cr_on_empty_line(lnum, a:normal)
+  endif
+
+  if has_bp == 2
+    call s:cr_on_list_item(lnum, insert_new_marker, cur_col)
+  endif
+
+  call cursor(lnum+1, col("$") - cur_col)
+  if cur_col == 0
+    startinsert!
+  else
+    startinsert
+  endif
+
+endfunction "}}}
+
+"creates a list item in the current line or removes it
+function! vimwiki#lst#toggle_list_item() "{{{
+  let cur_col_from_eol = col("$") - col("'^")
+  let cur_item = s:get_item(line('.'))
+
+  if cur_item.type == 0
+    call s:create_marker(cur_item.lnum)
+  else
+    let prev_item = s:get_prev_list_item(cur_item, 1)
+    if prev_item.type == 0
+      let prev_item = s:get_corresponding_item(s:get_prev_line(cur_item.lnum))
+    endif
+    let cur_item = s:remove_mrkr(cur_item)
+    let adjust_prev_item = (prev_item.type == 2 &&
+          \ s:get_level(cur_item.lnum) <= s:get_level(prev_item.lnum)) ? 1 : 0
+    call s:indent_multiline(prev_item, cur_item.lnum)
+    if adjust_prev_item
+      call s:adjust_numbered_list_below(prev_item, 0)
+    endif
+  endif
+
+  "set cursor position s.t. it's on the same char as before
+  let new_cur_col = col("$") - cur_col_from_eol
+  call cursor(cur_item.lnum, new_cur_col >= 1 ? new_cur_col : 1)
+
+  if cur_col_from_eol == 0 || getline(cur_item.lnum) =~# '^\s*$'
+    startinsert!
+  else
+    startinsert
+  endif
+endfunction "}}}
+
+"handle keys }}}
+
+"misc stuff {{{
+
+function! vimwiki#lst#setup_marker_infos() "{{{
+  let l:bullet_types=g:vimwiki_bullet_types
+  if exists("g:vimwiki_additional_bullet_types")
+    call extend(l:bullet_types, g:vimwiki_additional_bullet_types)
+  endif
+  let s:rx_bullet_chars = '['.join(keys(l:bullet_types), '').']\+'
+
+  let s:multiple_bullet_chars = []
+  for i in keys(l:bullet_types)
+    if l:bullet_types[i] == 1
+      call add(s:multiple_bullet_chars, i)
+    endif
+  endfor
+
+  let s:number_kinds = []
+  let s:number_divisors = ""
+  for i in g:vimwiki_number_types
+    call add(s:number_kinds, i[0])
+    let s:number_divisors .= vimwiki#u#escape(i[1])
+  endfor
+
+  let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
+        \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
+
+  "create regexp for bulleted list items
+  let g:vimwiki_rxListBullet = join( map(keys(l:bullet_types),
+        \'vimwiki#u#escape(v:val).repeat("\\+", l:bullet_types[v:val])'
+        \ ) , '\|')
+
+  "create regex for numbered list items
+  if !empty(g:vimwiki_number_types)
+    let g:vimwiki_rxListNumber = '\C\%('
+    for type in g:vimwiki_number_types[:-2]
+      let g:vimwiki_rxListNumber .= s:char_to_rx[type[0]] .
+            \ vimwiki#u#escape(type[1]) . '\|'
+    endfor
+    let g:vimwiki_rxListNumber .= s:char_to_rx[g:vimwiki_number_types[-1][0]].
+          \ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
+  else
+    "regex that matches nothing
+    let g:vimwiki_rxListNumber = '$^'
+  endif
+
+  "the user can set the listsyms as string, but vimwiki needs a list
+  let g:vimwiki_listsyms_list = split(g:vimwiki_listsyms, '\zs')
+
+  if match(g:vimwiki_listsyms, g:vimwiki_listsym_rejected) != -1
+    echomsg "Warning: g:vimwiki_listsyms and g:vimwiki_listsym_rejected overlap"
+  endif
+endfunction "}}}
+
+function! vimwiki#lst#TO_list_item(inner, visual) "{{{
+  let lnum = prevnonblank('.')
+  let item = s:get_corresponding_item(lnum)
+  if item.type == 0
+    return
+  endif
+  let from_line = item.lnum
+  if a:inner
+    let to_line = s:get_last_line_of_item(item)
+  else
+    let to_line = s:get_last_line_of_item_incl_children(item)
+  endif
+  normal! V
+  call cursor(to_line, 0)
+  normal! o
+  call cursor(from_line, 0)
+endfunction "}}}
+
+fun! vimwiki#lst#fold_level(lnum) "{{{
+  let cur_item = s:get_item(a:lnum)
+  if cur_item.type != 0
+    let parent_item = s:get_parent(cur_item)
+    let child_item = s:get_first_child(cur_item)
+    let next_item = s:get_next_child_item(parent_item, cur_item)
+    if child_item.type != 0
+      return 'a1'
+    elseif next_item.type == 0
+      return 's1'
+    endif
+  endif
+  return '='
+endf "}}}
+
+"misc stuff }}}

From 5ad702cce6116e2f2f507a5493b7349451156f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 4 Apr 2018 03:31:54 +0200
Subject: [PATCH 071/108] Revert 89d28a7

This was committed by accident. Since 53745e8 had to be done by machine
this it not a real revert, but a redo of 53745e8. Due to the matter of
53745e8 it's slightly different.
---
 autoload/vimwiki/lst.vim | 64 +++-------------------------------------
 1 file changed, 4 insertions(+), 60 deletions(-)

diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 6cfe758..255ba72 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1401,8 +1401,7 @@ endfunction "}}}
 function! s:cr_on_empty_list_item(lnum, behavior) "{{{
   if a:behavior == 1
     "just make a new list item
-    normal! gi
-
+    normal! gi
     call s:clone_marker_from_to(a:lnum, a:lnum+1)
     startinsert!
     return
@@ -1458,8 +1457,7 @@ endfunction "}}}
 function! s:cr_on_empty_line(lnum, behavior) "{{{
   "inserting and deleting the x is necessary
   "because otherwise the indent is lost
-  normal! gi
-x
+  normal! gix
   if a:behavior == 2 || a:behavior == 3
     call s:create_marker(a:lnum+1)
   endif
@@ -1468,8 +1466,7 @@ endfunction "}}}
 function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
   if a:insert_new_marker
     "the ultimate feature of this script: make new marker on <CR>
-    normal! gi
-
+    normal! gi
     call s:clone_marker_from_to(a:lnum, a:lnum+1)
     "tiny sweet extra feature: indent next line if current line ends with :
     if !a:not_at_eol && getline(a:lnum) =~# ':$'
@@ -1478,8 +1475,7 @@ function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
   else
     " || (cur_item.lnum < s:get_last_line_of_item(cur_item))
     "indent this line so that it becomes the continuation of the line above
-    normal! gi
-
+    normal! gi
     let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
     call s:indent_multiline(prev_line, a:lnum+1)
   endif
@@ -1568,58 +1564,6 @@ endfunction "}}}
 "handle keys }}}
 
 "misc stuff {{{
-
-function! vimwiki#lst#setup_marker_infos() "{{{
-  let l:bullet_types=g:vimwiki_bullet_types
-  if exists("g:vimwiki_additional_bullet_types")
-    call extend(l:bullet_types, g:vimwiki_additional_bullet_types)
-  endif
-  let s:rx_bullet_chars = '['.join(keys(l:bullet_types), '').']\+'
-
-  let s:multiple_bullet_chars = []
-  for i in keys(l:bullet_types)
-    if l:bullet_types[i] == 1
-      call add(s:multiple_bullet_chars, i)
-    endif
-  endfor
-
-  let s:number_kinds = []
-  let s:number_divisors = ""
-  for i in g:vimwiki_number_types
-    call add(s:number_kinds, i[0])
-    let s:number_divisors .= vimwiki#u#escape(i[1])
-  endfor
-
-  let s:char_to_rx = {'1': '\d\+', 'i': '[ivxlcdm]\+', 'I': '[IVXLCDM]\+',
-        \ 'a': '\l\{1,2}', 'A': '\u\{1,2}'}
-
-  "create regexp for bulleted list items
-  let g:vimwiki_rxListBullet = join( map(keys(l:bullet_types),
-        \'vimwiki#u#escape(v:val).repeat("\\+", l:bullet_types[v:val])'
-        \ ) , '\|')
-
-  "create regex for numbered list items
-  if !empty(g:vimwiki_number_types)
-    let g:vimwiki_rxListNumber = '\C\%('
-    for type in g:vimwiki_number_types[:-2]
-      let g:vimwiki_rxListNumber .= s:char_to_rx[type[0]] .
-            \ vimwiki#u#escape(type[1]) . '\|'
-    endfor
-    let g:vimwiki_rxListNumber .= s:char_to_rx[g:vimwiki_number_types[-1][0]].
-          \ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
-  else
-    "regex that matches nothing
-    let g:vimwiki_rxListNumber = '$^'
-  endif
-
-  "the user can set the listsyms as string, but vimwiki needs a list
-  let g:vimwiki_listsyms_list = split(g:vimwiki_listsyms, '\zs')
-
-  if match(g:vimwiki_listsyms, g:vimwiki_listsym_rejected) != -1
-    echomsg "Warning: g:vimwiki_listsyms and g:vimwiki_listsym_rejected overlap"
-  endif
-endfunction "}}}
-
 function! vimwiki#lst#TO_list_item(inner, visual) "{{{
   let lnum = prevnonblank('.')
   let item = s:get_corresponding_item(lnum)

From 9b5e4b445a102e3e05732e8a0f4f2dd32ab6c3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 4 Apr 2018 16:54:41 +0200
Subject: [PATCH 072/108] Revert previous changes

---
 autoload/vimwiki/html.vim |  6 +-----
 autoload/vimwiki/lst.vim  | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 65c2315..11261c7 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1457,11 +1457,7 @@ function! s:convert_file(path_html, wikifile) "{{{
     endif
 
     " prepare regexps for lists
-    if exists("g:vimwiki_additional_bullet_types")
-      let s:bullets = '[*-'. join(keys(g:vimwiki_additional_bullet_types), '') . ']'
-    else
-      let s:bullets = '[*-]'
-    endif
+    let s:bullets = '[*-]'
     let s:numbers =
       \'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'
 
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 255ba72..390e542 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1401,7 +1401,7 @@ endfunction "}}}
 function! s:cr_on_empty_list_item(lnum, behavior) "{{{
   if a:behavior == 1
     "just make a new list item
-    normal! gi
+    normal! gi

     call s:clone_marker_from_to(a:lnum, a:lnum+1)
     startinsert!
     return
@@ -1428,7 +1428,7 @@ function! s:cr_on_empty_list_item(lnum, behavior) "{{{
     let neighbor_item = s:get_a_neighbor_item(item)
     let child_item = s:get_first_child(item)
     let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
-    normal! "_cc
+    normal! "_cc
     call s:adjust_numbered_list(neighbor_item, 0, 0)
     call s:adjust_numbered_list(child_item, 0, 0)
     call s:update_state(parent_item)
@@ -1457,7 +1457,7 @@ endfunction "}}}
 function! s:cr_on_empty_line(lnum, behavior) "{{{
   "inserting and deleting the x is necessary
   "because otherwise the indent is lost
-  normal! gix
+  normal! gi
x
   if a:behavior == 2 || a:behavior == 3
     call s:create_marker(a:lnum+1)
   endif
@@ -1466,7 +1466,7 @@ endfunction "}}}
 function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
   if a:insert_new_marker
     "the ultimate feature of this script: make new marker on <CR>
-    normal! gi
+    normal! gi

     call s:clone_marker_from_to(a:lnum, a:lnum+1)
     "tiny sweet extra feature: indent next line if current line ends with :
     if !a:not_at_eol && getline(a:lnum) =~# ':$'
@@ -1475,7 +1475,7 @@ function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
   else
     " || (cur_item.lnum < s:get_last_line_of_item(cur_item))
     "indent this line so that it becomes the continuation of the line above
-    normal! gi
+    normal! gi

     let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
     call s:indent_multiline(prev_line, a:lnum+1)
   endif

From ec516cfdbd593fff3e86ed3db4c0ffde70908688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 4 Apr 2018 17:03:49 +0200
Subject: [PATCH 073/108] Once again

---
 doc/vimwiki.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 7cf6842..d0c432b 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -1559,10 +1559,6 @@ after a list using letters or vice versa, Vimwiki will get confused because
 it cannot distinguish which is which (at least if the types are both upper
 case or both lower case).
 
-You can add additional list-types in your vimrc by setting the variable 
-  let g:vimwiki_additional_bullet_types = { "→": 0}
-Corresponding mapings will not be set.
-
 See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
 |vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI|
 

From a144be2a30c96790f110b9a4e1d5597ffa627c6a Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 6 Apr 2018 07:16:07 +0200
Subject: [PATCH 074/108] Improve header text objects

- make it work for markdown and media syntax as well
- don't find headers in preformatted text or headers of the form = foo ==
- introduce iH and aH text objects for headers plus subheaders
- add a count to include parent headers

Inspired by #462
---
 autoload/vimwiki/base.vim | 145 ++++++++++++++++++++++++++++----------
 ftplugin/vimwiki.vim      |  14 ++--
 2 files changed, 117 insertions(+), 42 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index fc5258e..671a441 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1093,6 +1093,7 @@ function! vimwiki#base#find_prev_link() "{{{
 endfunction " }}}
 
 " vimwiki#base#follow_link
+" This is an API function, that is, remappable by the user. Don't change the signature.
 function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
   " Parse link at cursor and pass to VimwikiLinkHandler, or failing that, the
   " default open_link handler
@@ -1356,48 +1357,82 @@ endfunction "}}}
 
 " TEXT OBJECTS functions {{{
 
-" vimwiki#base#TO_header
-function! vimwiki#base#TO_header(inner, visual) "{{{
-  if !search('^\(=\+\).\+\1\s*$', 'bcW')
+function! vimwiki#base#TO_header(inner, including_subheaders, count)
+  let headers = s:collect_headers()
+  if empty(headers)
     return
   endif
-  
-  let sel_start = line("'<")
-  let sel_end = line("'>")
-  let block_start = line(".")
-  let advance = 0
 
-  let level = vimwiki#u#count_first_sym(getline('.'))
+  let current_line = line('.')
 
-  let is_header_selected = sel_start == block_start 
-        \ && sel_start != sel_end
-
-  if a:visual && is_header_selected
-    if level > 1
-      let level -= 1
-      call search('^\(=\{'.level.'\}\).\+\1\s*$', 'bcW')
-    else
-      let advance = 1
-    endif
-  endif
-
-  normal! V
-
-  if a:visual && is_header_selected
-    call cursor(sel_end + advance, 0)
-  endif
-
-  if search('^\(=\{1,'.level.'}\).\+\1\s*$', 'W')
-    call cursor(line('.') - 1, 0)
+  " look for the header under which the cursor sits
+  if current_line >= headers[-1][0]
+    let current_header_index = len(headers) - 1
   else
-    call cursor(line('$'), 0)
+    let current_header_index = -1
+    while headers[current_header_index+1][0] <= current_line
+      let current_header_index += 1
+    endwhile
   endif
 
-  if a:inner && getline(line('.')) =~# '^\s*$'
-    let lnum = prevnonblank(line('.') - 1)
-    call cursor(lnum, 0)
+  if current_header_index < 0
+    return
   endif
-endfunction "}}}
+
+  " from which to which header
+  if !a:including_subheaders && a:count <= 1
+    let first_line = headers[current_header_index][0]
+    let last_line = current_header_index == len(headers)-1 ? line('$') :
+          \ headers[current_header_index + 1][0] - 1
+  else
+    let first_header_index = current_header_index
+    for _ in range(a:count - 1)
+      let parent = s:get_another_header(headers, first_header_index, -1, '<')
+      if parent < 0
+        break
+      else
+        let first_header_index = parent
+      endif
+    endfor
+
+    let next_sibling_or_higher = s:get_another_header(headers, first_header_index, +1, '<=')
+
+    let first_line = headers[first_header_index][0]
+    let last_line =
+          \ next_sibling_or_higher >= 0 ? headers[next_sibling_or_higher][0] - 1 : line('$')
+  endif
+
+  if a:inner
+    let first_line += 1
+    let last_line = prevnonblank(last_line)
+  endif
+
+  if first_line > last_line
+    " this can happen e.g. when doing vih on a header with another header in the very next line
+    return
+  endif
+
+  call cursor(first_line, 1)
+  normal! V
+  call cursor(last_line, 1)
+endfunction
+
+
+function! s:get_another_header(headers, current_index, direction, operation)
+  let current_level = a:headers[a:current_index][1]
+  let index = a:current_index + a:direction
+
+  while 1
+    if index < 0 || index >= len(a:headers)
+      return -1
+    endif
+    if eval('a:headers[index][1] ' . a:operation . ' current_level')
+      return index
+    endif
+    let index += a:direction
+  endwhile
+endfunction
+
 
 " vimwiki#base#TO_table_cell
 function! vimwiki#base#TO_table_cell(inner, visual) "{{{
@@ -1642,6 +1677,42 @@ function! vimwiki#base#RemoveHeaderLevel() "{{{
   endif
 endfunction " }}}
 
+
+" Returns all the headers in the current buffer as a list of the form
+" [[line_number, header_level, header_text], [...], [...], ...]
+function! s:collect_headers()
+  let is_inside_pre_or_math = 0  " 1: inside pre, 2: inside math, 0: outside
+  let headers = []
+  for lnum in range(1, line('$'))
+    let line_content = getline(lnum)
+    if (is_inside_pre_or_math == 1 && line_content =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')) ||
+       \ (is_inside_pre_or_math == 2 && line_content =~# vimwiki#vars#get_syntaxlocal('rxMathEnd'))
+      let is_inside_pre_or_math = 0
+      continue
+    endif
+    if is_inside_pre_or_math > 0
+      continue
+    endif
+    if line_content =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
+      let is_inside_pre_or_math = 1
+      continue
+    endif
+    if line_content =~# vimwiki#vars#get_syntaxlocal('rxMathStart')
+      let is_inside_pre_or_math = 2
+      continue
+    endif
+    if line_content !~# vimwiki#vars#get_syntaxlocal('rxHeader')
+      continue
+    endif
+    let header_level = vimwiki#u#count_first_sym(line_content)
+    let header_text = vimwiki#u#trim(matchstr(line_content, vimwiki#vars#get_syntaxlocal('rxHeader')))
+    call add(headers, [lnum, header_level, header_text])
+  endfor
+
+  return headers
+endfunction
+
+
 " a:create == 1: creates or updates TOC in current file
 " a:create == 0: update if TOC exists
 function! vimwiki#base#table_of_contents(create)
@@ -1687,10 +1758,8 @@ function! vimwiki#base#table_of_contents(create)
     endfor
     let h_complete_id .= headers_levels[h_level-1][0]
 
-    if numbering > 0
-          \ && numbering <= h_level
-      let h_number = join(map(copy(headers_levels[
-            \ numbering-1 : h_level-1]), 'v:val[1]'), '.')
+    if numbering > 0 && numbering <= h_level
+      let h_number = join(map(copy(headers_levels[numbering-1 : h_level-1]), 'v:val[1]'), '.')
       let h_number .= vimwiki#vars#get_global('html_header_numbering_sym')
       let h_text = h_number.' '.h_text
     endif
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 8c0ae90..8ae421c 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -620,11 +620,17 @@ nnoremap <silent><script><buffer>
 
 
 " Text objects {{{
-onoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 0)<CR>
-vnoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 1)<CR>
+onoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 0, v:count1)<CR>
+vnoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 0, v:count1)<CR>
 
-onoremap <silent><buffer> ih :<C-U>call vimwiki#base#TO_header(1, 0)<CR>
-vnoremap <silent><buffer> ih :<C-U>call vimwiki#base#TO_header(1, 1)<CR>
+onoremap <silent><buffer> ih :<C-U>call vimwiki#base#TO_header(1, 0, v:count1)<CR>
+vnoremap <silent><buffer> ih :<C-U>call vimwiki#base#TO_header(1, 0, v:count1)<CR>
+
+onoremap <silent><buffer> aH :<C-U>call vimwiki#base#TO_header(0, 1, v:count1)<CR>
+vnoremap <silent><buffer> aH :<C-U>call vimwiki#base#TO_header(0, 1, v:count1)<CR>
+
+onoremap <silent><buffer> iH :<C-U>call vimwiki#base#TO_header(1, 1, v:count1)<CR>
+vnoremap <silent><buffer> iH :<C-U>call vimwiki#base#TO_header(1, 1, v:count1)<CR>
 
 onoremap <silent><buffer> a\ :<C-U>call vimwiki#base#TO_table_cell(0, 0)<CR>
 vnoremap <silent><buffer> a\ :<C-U>call vimwiki#base#TO_table_cell(0, 1)<CR>

From a3b100ccaaa0f43113e0dab5ecf4e3b59db1ab17 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 6 Apr 2018 09:49:18 +0200
Subject: [PATCH 075/108] Update the documentation for header text objects

---
 doc/vimwiki.txt | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index d0c432b..30b407d 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -564,12 +564,22 @@ INSERT MODE                                            *vimwiki-list-mappings*
 ------------------------------------------------------------------------------
 3.3. Text objects                                       *vimwiki-text-objects*
 
-ah                      A section segment (the area between two consecutive
-                        headings) including trailing empty lines.
-ih                      A section segment without trailing empty lines.
+ah                      A header including its content up to the next header.
+ih                      The content under a header (like 'ah', but excluding
+                        the header itself and trailing empty lines).
 
-You can type 'vah' to select a section segment with its contents or 'dah' to
-delete it or 'yah' to yank it or 'cah' to change it.
+aH                      A header including all of its subheaders. When [count]
+                        is 2, include the parent header, when [count] is 3,
+                        the grandparent and so on.
+iH                      Like 'aH', but excluding the header itself and
+                        trailing empty lines.
+
+Examples:
+- type 'cih' to change the content under the current header
+- 'daH' deletes an entire header plus its content including the content of all
+  of its subheaders
+- 'v2aH' selects the parent header of the header the cursor is under plus all
+  of the content of all of its subheaders
 
 a\                      A cell in a table.
 i\                      An inner cell in a table.

From 2941913ccc2ca1e5bd2f482c770407a712810c1b Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 6 Apr 2018 21:11:40 +0200
Subject: [PATCH 076/108] Add keys for motions between headers

Fix #462
Inspired by #23
---
 autoload/vimwiki/base.vim | 113 +++++++++++++++++++++++++++++---------
 doc/vimwiki.txt           |  28 ++++++++++
 ftplugin/vimwiki.vim      |  30 ++++++++++
 3 files changed, 146 insertions(+), 25 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 671a441..ddad388 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1365,15 +1365,7 @@ function! vimwiki#base#TO_header(inner, including_subheaders, count)
 
   let current_line = line('.')
 
-  " look for the header under which the cursor sits
-  if current_line >= headers[-1][0]
-    let current_header_index = len(headers) - 1
-  else
-    let current_header_index = -1
-    while headers[current_header_index+1][0] <= current_line
-      let current_header_index += 1
-    endwhile
-  endif
+  let current_header_index = s:current_header(headers, current_line)
 
   if current_header_index < 0
     return
@@ -1418,22 +1410,6 @@ function! vimwiki#base#TO_header(inner, including_subheaders, count)
 endfunction
 
 
-function! s:get_another_header(headers, current_index, direction, operation)
-  let current_level = a:headers[a:current_index][1]
-  let index = a:current_index + a:direction
-
-  while 1
-    if index < 0 || index >= len(a:headers)
-      return -1
-    endif
-    if eval('a:headers[index][1] ' . a:operation . ' current_level')
-      return index
-    endif
-    let index += a:direction
-  endwhile
-endfunction
-
-
 " vimwiki#base#TO_table_cell
 function! vimwiki#base#TO_table_cell(inner, visual) "{{{
   if col('.') == col('$')-1
@@ -1713,6 +1689,93 @@ function! s:collect_headers()
 endfunction
 
 
+function! s:current_header(headers, line_number)
+  if empty(a:headers)
+    return -1
+  endif
+
+  if a:line_number >= a:headers[-1][0]
+    return len(a:headers) - 1
+  endif
+
+  let current_header_index = -1
+  while a:headers[current_header_index+1][0] <= a:line_number
+    let current_header_index += 1
+  endwhile
+  return current_header_index
+endfunction
+
+
+function! s:get_another_header(headers, current_index, direction, operation)
+  if empty(a:headers) || a:current_index < 0
+    return -1
+  endif
+  let current_level = a:headers[a:current_index][1]
+  let index = a:current_index + a:direction
+
+  while 1
+    if index < 0 || index >= len(a:headers)
+      return -1
+    endif
+    if eval('a:headers[index][1] ' . a:operation . ' current_level')
+      return index
+    endif
+    let index += a:direction
+  endwhile
+endfunction
+
+
+function! vimwiki#base#goto_parent_header()
+  let headers = s:collect_headers()
+  let current_header_index = s:current_header(headers, line('.'))
+  let parent_header = s:get_another_header(headers, current_header_index, -1, '<')
+  if parent_header >= 0
+    call cursor(headers[parent_header][0], 1)
+  else
+    echo 'Vimwiki: no parent header found'
+  endif
+endfunction
+
+
+function! vimwiki#base#goto_next_header()
+  let headers = s:collect_headers()
+  let current_header_index = s:current_header(headers, line('.'))
+  if current_header_index >= 0 && current_header_index < len(headers) - 1
+    call cursor(headers[current_header_index + 1][0], 1)
+  else
+    echo 'Vimwiki: no next header found'
+  endif
+endfunction
+
+
+function! vimwiki#base#goto_prev_header()
+  let headers = s:collect_headers()
+  let current_header_index = s:current_header(headers, line('.'))
+  " if the cursor already was on a header, jump to the previous one
+  if current_header_index >= 1 && headers[current_header_index][0] == line('.')
+    let current_header_index -= 1
+  endif
+  if current_header_index >= 0
+    call cursor(headers[current_header_index][0], 1)
+  else
+    echom 'Vimwiki: no previous header found'
+  endif
+endfunction
+
+
+function! vimwiki#base#goto_sibling(direction)
+  let headers = s:collect_headers()
+  let current_header_index = s:current_header(headers, line('.'))
+  let next_potential_sibling = s:get_another_header(headers, current_header_index, a:direction, '<=')
+  if next_potential_sibling >= 0 && headers[next_potential_sibling][1] ==
+        \ headers[current_header_index][1]
+    call cursor(headers[next_potential_sibling][0], 1)
+  else
+    echo 'Vimwiki: no sibling header found'
+  endif
+endfunction
+
+
 " a:create == 1: creates or updates TOC in current file
 " a:create == 0: update if TOC exists
 function! vimwiki#base#table_of_contents(create)
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 30b407d..bcca97a 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -324,6 +324,34 @@ NORMAL MODE                                           *vimwiki-local-mappings*
 -                       Remove header level.
                         To remap: >
                         :nmap -- <Plug>VimwikiRemoveHeaderLevel
+<
+                        *vimwiki_[[*
+[[                      Go to the previous header in the buffer.
+                        To remap: >
+                        :nmap <- <Plug>VimwikiGoToPrevHeader
+<
+                        *vimwiki_]]*
+]]                      Go to the next header in the buffer.
+                        To remap: >
+                        :nmap -> <Plug>VimwikiGoToNextHeader
+<
+                        *vimwiki_[=*
+[=                      Go to the previous header which has the same level as
+                        the header the cursor is currently under.
+                        To remap: >
+                        :nmap <= <Plug>VimwikiGoToPrevSiblingHeader
+<
+                        *vimwiki_]=*
+]=                      Go to the next header which has the same level as the
+                        header the cursor is currently under.
+                        To remap: >
+                        :nmap => <Plug>VimwikiGoToNextSiblingHeader
+<
+                        *vimwiki_]u*  *vimwiki_[u*
+]u [u                   Go one level up -- that is, to the parent header of
+                        the header the cursor is currently under.
+                        To remap: >
+                        :nmap -^ <Plug>VimwikiGoToParentHeader
 <
                         *vimwiki_+*
 +                       Create and/or decorate links.  Depending on the
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 8ae421c..9d33bd7 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -662,6 +662,36 @@ endif
 nnoremap <silent><buffer> <Plug>VimwikiRemoveHeaderLevel :
       \<C-U>call vimwiki#base#RemoveHeaderLevel()<CR>
 
+if !hasmapto('<Plug>VimwikiGoToParentHeader')
+  nmap <silent><buffer> ]u <Plug>VimwikiGoToParentHeader
+  nmap <silent><buffer> [u <Plug>VimwikiGoToParentHeader
+endif
+nnoremap <silent><buffer> <Plug>VimwikiGoToParentHeader :
+      \<C-u>call vimwiki#base#goto_parent_header()<CR>
+
+if !hasmapto('<Plug>VimwikiGoToNextHeader')
+  nmap <silent><buffer> ]] <Plug>VimwikiGoToNextHeader
+endif
+nnoremap <silent><buffer> <Plug>VimwikiGoToNextHeader :
+      \<C-u>call vimwiki#base#goto_next_header()<CR>
+
+if !hasmapto('<Plug>VimwikiGoToPrevHeader')
+  nmap <silent><buffer> [[ <Plug>VimwikiGoToPrevHeader
+endif
+nnoremap <silent><buffer> <Plug>VimwikiGoToPrevHeader :
+      \<C-u>call vimwiki#base#goto_prev_header()<CR>
+
+if !hasmapto('<Plug>VimwikiGoToNextSiblingHeader')
+  nmap <silent><buffer> ]= <Plug>VimwikiGoToNextSiblingHeader
+endif
+nnoremap <silent><buffer> <Plug>VimwikiGoToNextSiblingHeader :
+      \<C-u>call vimwiki#base#goto_sibling(+1)<CR>
+
+if !hasmapto('<Plug>VimwikiGoToPrevSiblingHeader')
+  nmap <silent><buffer> [= <Plug>VimwikiGoToPrevSiblingHeader
+endif
+nnoremap <silent><buffer> <Plug>VimwikiGoToPrevSiblingHeader :
+      \<C-u>call vimwiki#base#goto_sibling(-1)<CR>
 
 " }}}
 

From bf2039555ae813f5bbb83a3260b262fcad44a509 Mon Sep 17 00:00:00 2001
From: Jonathan McElroy <jonathanpmcelroy@gmail.com>
Date: Mon, 12 Dec 2016 16:49:05 -0600
Subject: [PATCH 077/108] Allow Powershell to open links in Windows

---
 autoload/vimwiki/base.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index ddad388..89cd00e 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -228,7 +228,11 @@ function! vimwiki#base#system_open_link(url) "{{{
     else
       let url = shellescape(a:url, 1)
     endif
-    execute 'silent ! start "Title" /B ' . url
+    if &l:shell ==? "powershell"
+      execute 'silent ! start ' . a:url
+    else
+      execute 'silent ! start "Title" /B ' . a:url
+    endif
   endfunction
   function! s:macunix_handler(url)
     call system('open ' . shellescape(a:url).' &')

From 86a8604c4e127fa397c513471250c05b305244d3 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sun, 8 Apr 2018 20:41:27 +0200
Subject: [PATCH 078/108] Remove recently introduced code duplication

---
 autoload/vimwiki/base.vim | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 89cd00e..1d1ec89 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1783,34 +1783,13 @@ endfunction
 " a:create == 1: creates or updates TOC in current file
 " a:create == 0: update if TOC exists
 function! vimwiki#base#table_of_contents(create)
-  " collect new headers
-  let is_inside_pre_or_math = 0  " 1: inside pre, 2: inside math, 0: outside
+  let headers = s:collect_headers()
   let numbering = vimwiki#vars#get_global('html_header_numbering')
-  let headers = []
   let headers_levels = [['', 0], ['', 0], ['', 0], ['', 0], ['', 0], ['', 0]]
-  for lnum in range(1, line('$'))
-    let line_content = getline(lnum)
-    if (is_inside_pre_or_math == 1 && line_content =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')) ||
-          \ (is_inside_pre_or_math == 2 && line_content =~# vimwiki#vars#get_syntaxlocal('rxMathEnd'))
-      let is_inside_pre_or_math = 0
-      continue
-    endif
-    if is_inside_pre_or_math > 0
-      continue
-    endif
-    if line_content =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
-      let is_inside_pre_or_math = 1
-      continue
-    endif
-    if line_content =~# vimwiki#vars#get_syntaxlocal('rxMathStart')
-      let is_inside_pre_or_math = 2
-      continue
-    endif
-    if line_content !~# vimwiki#vars#get_syntaxlocal('rxHeader')
-      continue
-    endif
-    let h_level = vimwiki#u#count_first_sym(line_content)
-    let h_text = vimwiki#u#trim(matchstr(line_content, vimwiki#vars#get_syntaxlocal('rxHeader')))
+  let complete_header_infos = []
+  for header in headers
+    let h_text = header[2]
+    let h_level = header[1]
     if h_text ==# vimwiki#vars#get_global('toc_header')  " don't include the TOC's header itself
       continue
     endif
@@ -1831,14 +1810,14 @@ function! vimwiki#base#table_of_contents(create)
       let h_text = h_number.' '.h_text
     endif
 
-    call add(headers, [h_level, h_complete_id, h_text])
+    call add(complete_header_infos, [h_level, h_complete_id, h_text])
   endfor
 
   let lines = []
   let startindent = repeat(' ', vimwiki#lst#get_list_margin())
   let indentstring = repeat(' ', vimwiki#u#sw())
   let bullet = vimwiki#lst#default_symbol().' '
-  for [lvl, link, desc] in headers
+  for [lvl, link, desc] in complete_header_infos
     let esc_link = substitute(link, "'", "''", 'g')
     let esc_desc = substitute(desc, "'", "''", 'g')
     let link = s:safesubstitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__',

From 65c4ffaccac9516182bdf9b64dbd67d2799520f8 Mon Sep 17 00:00:00 2001
From: Petrus <silencly07@gmail.com>
Date: Fri, 13 Apr 2018 17:03:21 +0800
Subject: [PATCH 079/108] fix missing custom_wiki2html_args default key

Ref #475
---
 autoload/vimwiki/html.vim | 2 +-
 autoload/vimwiki/vars.vim | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 11261c7..9d0440b 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1397,7 +1397,7 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
       \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ? vimwiki#vars#get_wikilocal('template_default') : '-'). ' '.
       \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ? vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '.
       \ (len(vimwiki#vars#get_bufferlocal('subdir')) > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir'))) : '-'). ' '.
-      \ (len(vimwiki#vars#get_global('custom_wiki2html_args')) > 0 ? vimwiki#vars#get_global('custom_wiki2html_args') : '-'))
+      \ (len(vimwiki#vars#get_wikilocal('custom_wiki2html_args')) > 0 ? vimwiki#vars#get_wikilocal('custom_wiki2html_args') : '-'))
 endfunction " }}}
 
 function! s:convert_file(path_html, wikifile) "{{{
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index b1836a2..3efd8c6 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -187,6 +187,7 @@ function! s:populate_wikilocal_options()
         \ 'automatic_nested_syntaxes': 1,
         \ 'css_name': 'style.css',
         \ 'custom_wiki2html': '',
+        \ 'custom_wiki2html_args': '',
         \ 'diary_header': 'Diary',
         \ 'diary_index': 'diary',
         \ 'diary_rel_path': 'diary/',

From 703656144629aa5b2b24b3114cf730fb1bb36151 Mon Sep 17 00:00:00 2001
From: Brian Gianforcaro <bgianf@microsoft.com>
Date: Tue, 3 Apr 2018 16:48:24 -0700
Subject: [PATCH 080/108] Add VimwikiMakeTomorrowDiaryNote

This change introduces a new global diary command "VimwikiMakeTomorrowDiaryNote". The purpose is the
same as VimwikiMakeYesterdayDiaryNote, except it allows
you to create a diary note in the future.

I find this useful when trying to plan my day the night before.
---
 doc/vimwiki.txt    | 18 ++++++++++++++++++
 plugin/vimwiki.vim |  8 ++++++++
 2 files changed, 26 insertions(+)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index bcca97a..db6a93e 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -213,6 +213,22 @@ See also |:VimwikiTabMakeDiaryNote|
 <
 See also |:VimwikiMakeYesterdayDiaryNote|
 
+[count]<Leader>w<Leader>m or <Plug>VimwikiMakeTomorrowDiaryNote
+        Open diary wiki-file for tomorrow of the [count]'s wiki.
+
+        <Leader>w<Leader>m opens diary wiki-file for tomorrow in the first
+        wiki from |g:vimwiki_list|.
+        1<Leader>w<Leader>m as above opens diary wiki-file for tomorrow in
+        the first wiki from |g:vimwiki_list|.
+        2<Leader>w<Leader>m opens diary wiki-file for tomorrow in the second
+        wiki from |g:vimwiki_list|.
+        3<Leader>w<Leader>m opens diary wiki-file for tomorrow in the third
+        wiki from |g:vimwiki_list|.
+        etc.
+        To remap: >
+        :nmap <Leader>dm <Plug>VimwikiMakeTomorrowDiaryNote
+<
+See also |:VimwikiMakeTomorrowDiaryNote|
 
 ------------------------------------------------------------------------------
 3.2. Local mappings
@@ -645,6 +661,8 @@ il                      A single list item.
 *:VimwikiMakeYesterdayDiaryNote*
     Open diary wiki-file for yesterday of the current wiki.
 
+*:VimwikiMakeTomorrowDiaryNote*
+    Open diary wiki-file for tomorrow of the current wiki.
 
 ------------------------------------------------------------------------------
 4.2. Local commands                                   *vimwiki-local-commands*
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 8fe5f93..634d6b5 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -247,6 +247,8 @@ command! -count=1 VimwikiTabMakeDiaryNote
       \ call vimwiki#diary#make_note(v:count1, 1)
 command! -count=1 VimwikiMakeYesterdayDiaryNote
       \ call vimwiki#diary#make_note(v:count1, 0, vimwiki#diary#diary_date_link(localtime() - 60*60*24))
+command! -count=1 VimwikiMakeTomorrowDiaryNote
+      \ call vimwiki#diary#make_note(v:count1, 0, vimwiki#diary#diary_date_link(localtime() + 60*60*24))
 
 command! VimwikiDiaryGenerateLinks
       \ call vimwiki#diary#generate_diary_section()
@@ -297,6 +299,12 @@ endif
 nnoremap <unique><script> <Plug>VimwikiMakeYesterdayDiaryNote
       \ :VimwikiMakeYesterdayDiaryNote<CR>
 
+if !hasmapto('<Plug>VimwikiMakeTomorrowDiaryNote')
+  exe 'nmap <silent><unique> '.s:map_prefix.'<Leader>m <Plug>VimwikiMakeTomorrowDiaryNote'
+endif
+nnoremap <unique><script> <Plug>VimwikiMakeTomorrowDiaryNote
+      \ :VimwikiMakeTomorrowDiaryNote<CR>
+
 "}}}
 
 " MENU {{{

From cdc37162a992026c74179c87b787b2cdd4c008af Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Mon, 16 Apr 2018 20:40:18 +0200
Subject: [PATCH 081/108] Escape only '"' in links

Fix #467
Ref #474
---
 autoload/vimwiki/html.vim | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 9d0440b..7ec27f3 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -134,13 +134,11 @@ function! s:safe_html_preformatted(line) "{{{
   return line
 endfunction "}}}
 
-function! s:safe_html_anchor(string) "{{{
-  let string = substitute(a:string, '"', '\&quot;', 'g')
-  let string = substitute(string, "'", '\&#39;', 'g')
-  let string = substitute(string, '/', '\&#47;', 'g')
-  let string = substitute(string, '\t', ' ', 'g') " &#9; doesn't work
-  return string
-endfunction "}}}
+
+function! s:escape_html_attribute(string)
+  return substitute(a:string, '"', '\&quot;', 'g')
+endfunction
+
 
 function! s:safe_html_line(line) "{{{
   " escape & < > when producing HTML text
@@ -288,7 +286,7 @@ endfunction "}}}
 
 function! s:tag_strong(value, header_ids) "{{{
   let text = s:mid(a:value, 1)
-  let id = s:safe_html_anchor(text)
+  let id = s:escape_html_attribute(text)
   let complete_id = ''
   for l in range(6)
     if a:header_ids[l][0] != ''
@@ -299,7 +297,7 @@ function! s:tag_strong(value, header_ids) "{{{
     let complete_id = complete_id[:-2]
   endif
   let complete_id .= '-'.id
-  return '<span id="'.s:safe_html_anchor(complete_id).'"></span><strong id="'
+  return '<span id="'.s:escape_html_attribute(complete_id).'"></span><strong id="'
         \ .id.'">'.text.'</strong>'
 endfunction "}}}
 
@@ -313,11 +311,11 @@ function! s:tag_tags(value, header_ids) "{{{
   if a:header_ids[5][0] == ''
     let complete_id = complete_id[:-2]
   endif
-  let complete_id = s:safe_html_anchor(complete_id)
+  let complete_id = s:escape_html_attribute(complete_id)
 
   let result = []
   for tag in split(a:value, ':')
-    let id = s:safe_html_anchor(tag)
+    let id = s:escape_html_attribute(tag)
     call add(result, '<span id="'.complete_id.'-'.id.'"></span><span class="tag" id="'
           \ .id.'">'.tag.'</span>')
   endfor
@@ -369,7 +367,7 @@ endfunction
 "}}}
 
 function! vimwiki#html#linkify_link(src, descr) "{{{
-  let src_str = ' href="'.s:safe_html_anchor(a:src).'"'
+  let src_str = ' href="'.s:escape_html_attribute(a:src).'"'
   let descr = substitute(a:descr,'^\s*\(.*\)\s*$','\1','')
   let descr = (descr == "" ? a:src : descr)
   let descr_str = (descr =~# vimwiki#vars#get_global('rxWikiIncl')
@@ -450,8 +448,8 @@ function! s:tag_wikilink(value) "{{{
       " external file links are always absolute
       let html_link = link_infos.filename
     elseif link_infos.scheme ==# 'local'
-      let html_link = vimwiki#path#relpath(fnamemodify(s:current_html_file,
-            \ ':h'), link_infos.filename)
+      let html_link = vimwiki#path#relpath(fnamemodify(s:current_html_file, ':h'),
+            \ link_infos.filename)
     elseif link_infos.scheme =~# '\mwiki\d\+\|diary'
       " wiki links are always relative to the current file
       let html_link = vimwiki#path#relpath(
@@ -471,7 +469,7 @@ function! s:tag_wikilink(value) "{{{
     let line = html_link
   endif
 
-  let line =vimwiki#html#linkify_link(line, descr)
+  let line = vimwiki#html#linkify_link(line, descr)
   return line
 endfunction "}}}
 "}}}
@@ -1025,7 +1023,7 @@ function! s:process_tag_h(line, id) "{{{
     let h_text = vimwiki#u#trim(matchstr(line, vimwiki#vars#get_syntaxlocal('rxHeader')))
     let h_number = ''
     let h_complete_id = ''
-    let h_id = s:safe_html_anchor(h_text)
+    let h_id = s:escape_html_attribute(h_text)
     let centered = (a:line =~# '^\s')
 
     if h_text !=# vimwiki#vars#get_global('toc_header')
@@ -1054,7 +1052,7 @@ function! s:process_tag_h(line, id) "{{{
         endif
         let h_text = num.' '.h_text
       endif
-      let h_complete_id = s:safe_html_anchor(h_complete_id)
+      let h_complete_id = s:escape_html_attribute(h_complete_id)
       let h_part = '<div id="'.h_complete_id.'"><h'.h_level.' id="'.h_id.'"'
 
     else

From 3556de54e1203d03d2a19871217e0a3021a57e01 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 17 Apr 2018 07:13:37 +0200
Subject: [PATCH 082/108] Small refactorings

---
 autoload/vimwiki/base.vim | 18 +++++++++---------
 ftplugin/vimwiki.vim      |  2 +-
 plugin/vimwiki.vim        |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 1d1ec89..3a46cd9 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -77,7 +77,9 @@ function! vimwiki#base#invsubdir(subdir) " {{{
 endfunction " }}}
 
 
-" Returns: the number of the wiki a file belongs to
+" Returns: the number of the wiki a file belongs to or -1 if it doesn't belong
+" to any registered wiki.
+" The path can be the full path or just the directory of the file
 function! vimwiki#base#find_wiki(path) "{{{
   let path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(a:path))
   for idx in range(vimwiki#vars#number_of_wikis())
@@ -1881,14 +1883,12 @@ endfunction " }}}
 
 " vimwiki#base#normalize_link_helper
 function! vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template) " {{{
-  let str = a:str
-  let url = matchstr(str, a:rxUrl)
-  let descr = matchstr(str, a:rxDesc)
-  let template = a:template
+  let url = matchstr(a:str, a:rxUrl)
+  let descr = matchstr(a:str, a:rxDesc)
   if descr == ""
     let descr = s:clean_url(url)
   endif
-  let lnk = s:safesubstitute(template, '__LinkDescription__', descr, '')
+  let lnk = s:safesubstitute(a:template, '__LinkDescription__', descr, '')
   let lnk = s:safesubstitute(lnk, '__LinkUrl__', url, '')
   return lnk
 endfunction " }}}
@@ -1978,8 +1978,8 @@ endfunction " }}}
 function! s:normalize_link_syntax_v() " {{{
   let sel_save = &selection
   let &selection = "old"
-  let rv = @"
-  let rt = getregtype('"')
+  let default_register_save = @"
+  let registertype_save = getregtype('"')
 
   try
     " Save selected text to register "
@@ -1997,7 +1997,7 @@ function! s:normalize_link_syntax_v() " {{{
     call setreg('"', sub, 'v')
     normal! `>""pgvd
   finally
-    call setreg('"', rv, rt)
+    call setreg('"', default_register_save, registertype_save)
     let &selection = sel_save
   endtry
 endfunction " }}}
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 9d33bd7..0ed7bef 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -51,7 +51,7 @@ function! Complete_wikifiles(findstart, base)
     return -1
   else
     " Completion works for wikilinks/anchors, and for tags. s:line_content
-    " tells us, which string came before a:base. There seems to be no easier
+    " tells us which string came before a:base. There seems to be no easier
     " solution, because calling col('.') here returns garbage.
     if s:line_context == ''
       return []
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 634d6b5..dc7b654 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -232,8 +232,8 @@ augroup END
 
 " COMMANDS {{{
 command! VimwikiUISelect call vimwiki#base#ui_select()
-" XXX: why not using <count> instead of v:count1?
-" See Issue 324.
+" why not using <count> instead of v:count1?
+" See https://github.com/vimwiki-backup/vimwiki/issues/324
 command! -count=1 VimwikiIndex
       \ call vimwiki#base#goto_index(v:count1)
 command! -count=1 VimwikiTabIndex

From 90dc1e58717bd25798bb16d3badab8908b619912 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 17 Apr 2018 08:53:08 +0200
Subject: [PATCH 083/108] Make ]] work when cursor is above first header

Ref #462
---
 autoload/vimwiki/base.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 3a46cd9..9432e9d 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1748,6 +1748,8 @@ function! vimwiki#base#goto_next_header()
   let current_header_index = s:current_header(headers, line('.'))
   if current_header_index >= 0 && current_header_index < len(headers) - 1
     call cursor(headers[current_header_index + 1][0], 1)
+  elseif current_header_index < 0 && !empty(headers)  " we're above the first header
+    call cursor(headers[0][0], 1)
   else
     echo 'Vimwiki: no next header found'
   endif
@@ -1764,7 +1766,7 @@ function! vimwiki#base#goto_prev_header()
   if current_header_index >= 0
     call cursor(headers[current_header_index][0], 1)
   else
-    echom 'Vimwiki: no previous header found'
+    echo 'Vimwiki: no previous header found'
   endif
 endfunction
 

From c1dbf90c2973b2a0f244005a4d17d4af6835b07d Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 20 Apr 2018 07:03:53 +0200
Subject: [PATCH 084/108] Remove foldmarkers; general reformatting

---
 autoload/vimwiki/base.vim          | 424 +++++++++++-----------
 autoload/vimwiki/diary.vim         | 128 ++++---
 autoload/vimwiki/html.vim          | 524 ++++++++++++++-------------
 autoload/vimwiki/lst.vim           | 545 ++++++++++++++++-------------
 autoload/vimwiki/markdown_base.vim |  64 ++--
 autoload/vimwiki/path.vim          |  62 ++--
 autoload/vimwiki/tags.vim          |  90 ++---
 autoload/vimwiki/tbl.vim           | 268 +++++++-------
 autoload/vimwiki/u.vim             |  45 ++-
 autoload/vimwiki/vars.vim          |   8 +-
 ftplugin/vimwiki.vim               | 194 +++++-----
 plugin/vimwiki.vim                 |  77 ++--
 syntax/vimwiki.vim                 | 214 ++++++-----
 syntax/vimwiki_default.vim         |  16 +-
 syntax/vimwiki_markdown.vim        |  17 +-
 syntax/vimwiki_markdown_custom.vim |  81 +++--
 syntax/vimwiki_media.vim           |  11 +-
 17 files changed, 1478 insertions(+), 1290 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 9432e9d..2f8aa52 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
 " Desc: Basic functionality
 " Home: https://github.com/vimwiki/vimwiki/
@@ -8,15 +8,15 @@ if exists("g:loaded_vimwiki_auto") || &cp
 endif
 let g:loaded_vimwiki_auto = 1
 
-" s:safesubstitute
-function! s:safesubstitute(text, search, replace, mode) "{{{
+
+function! s:safesubstitute(text, search, replace, mode)
   " Substitute regexp but do not interpret replace
   let escaped = escape(a:replace, '\&')
   return substitute(a:text, a:search, escaped, a:mode)
-endfunction " }}}
+endfunction
 
-" s:vimwiki_get_known_syntaxes
-function! s:vimwiki_get_known_syntaxes() " {{{
+
+function! s:vimwiki_get_known_syntaxes()
   " Getting all syntaxes that different wikis could have
   let syntaxes = {}
   let syntaxes['default'] = 1
@@ -29,21 +29,22 @@ function! s:vimwiki_get_known_syntaxes() " {{{
     let syntaxes[syn] = 1
   endfor
   return keys(syntaxes)
-endfunction " }}}
+endfunction
 
-" vimwiki#base#file_pattern
-function! vimwiki#base#file_pattern(files) "{{{ Get search regex from glob()
+
+function! vimwiki#base#file_pattern(files)
+  " Get search regex from glob()
   " string. Aim to support *all* special characters, forcing the user to choose
   "   names that are compatible with any external restrictions that they
   "   encounter (e.g. filesystem, wiki conventions, other syntaxes, ...).
   "   See: https://github.com/vimwiki-backup/vimwiki/issues/316
-  " Change / to [/\\] to allow "Windows paths" 
+  " Change / to [/\\] to allow "Windows paths"
   return '\V\%('.join(a:files, '\|').'\)\m'
-endfunction "}}}
+endfunction
+
 
-" vimwiki#base#subdir
 "FIXME TODO slow and faulty
-function! vimwiki#base#subdir(path, filename) "{{{
+function! vimwiki#base#subdir(path, filename)
   let path = a:path
   " ensure that we are not fooled by a symbolic link
   "FIXME if we are not "fooled", we end up in a completely different wiki?
@@ -64,29 +65,28 @@ function! vimwiki#base#subdir(path, filename) "{{{
     let res = res.'/'
   endif
   return res
-endfunction "}}}
+endfunction
 
-" vimwiki#base#current_subdir
-function! vimwiki#base#current_subdir()"{{{
+
+function! vimwiki#base#current_subdir()
   return vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path'), expand('%:p'))
-endfunction"}}}
+endfunction
 
-" vimwiki#base#invsubdir
-function! vimwiki#base#invsubdir(subdir) " {{{
+
+function! vimwiki#base#invsubdir(subdir)
   return substitute(a:subdir, '[^/\.]\+/', '../', 'g')
-endfunction " }}}
+endfunction
 
 
 " Returns: the number of the wiki a file belongs to or -1 if it doesn't belong
 " to any registered wiki.
 " The path can be the full path or just the directory of the file
-function! vimwiki#base#find_wiki(path) "{{{
+function! vimwiki#base#find_wiki(path)
   let path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(a:path))
   for idx in range(vimwiki#vars#number_of_wikis())
     let idx_path = expand(vimwiki#vars#get_wikilocal('path', idx))
     let idx_path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(idx_path))
-    if vimwiki#path#is_equal(
-          \ vimwiki#path#path_common_pfx(idx_path, path), idx_path)
+    if vimwiki#path#is_equal(vimwiki#path#path_common_pfx(idx_path, path), idx_path)
       return idx
     endif
     let idx += 1
@@ -94,14 +94,14 @@ function! vimwiki#base#find_wiki(path) "{{{
 
   " an orphan page has been detected
   return -1
-endfunction "}}}
+endfunction
 
 
 " THE central function of Vimwiki. Extract infos about the target from a link.
 " If the second parameter is present, which should be an absolute file path, it
 " is assumed that the link appears in that file. Without it, the current file
 " is used.
-function! vimwiki#base#resolve_link(link_text, ...) "{{{
+function! vimwiki#base#resolve_link(link_text, ...)
   if a:0
     let source_wiki = vimwiki#base#find_wiki(a:1)
     let source_file = a:1
@@ -138,8 +138,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
   endif
   let link_text = matchstr(link_text, vimwiki#vars#get_global('rxSchemeUrlMatchUrl'))
 
-  let is_wiki_link = link_infos.scheme =~# '\mwiki\d\+' ||
-        \ link_infos.scheme ==# 'diary'
+  let is_wiki_link = link_infos.scheme =~# '\mwiki\d\+' || link_infos.scheme ==# 'diary'
 
   " extract anchor
   if is_wiki_link
@@ -198,8 +197,7 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
           \ vimwiki#vars#get_wikilocal('diary_rel_path', link_infos.index) .
           \ link_text .
           \ vimwiki#vars#get_wikilocal('ext', link_infos.index)
-  elseif (link_infos.scheme ==# 'file' || link_infos.scheme ==# 'local')
-        \ && is_relative
+  elseif (link_infos.scheme ==# 'file' || link_infos.scheme ==# 'local') && is_relative
     let link_infos.filename = simplify(root_dir . link_text)
   else " absolute file link
     " collapse repeated leading "/"'s within a link
@@ -211,11 +209,10 @@ function! vimwiki#base#resolve_link(link_text, ...) "{{{
 
   let link_infos.filename = vimwiki#path#normalize(link_infos.filename)
   return link_infos
-endfunction "}}}
+endfunction
 
 
-" vimwiki#base#system_open_link
-function! vimwiki#base#system_open_link(url) "{{{
+function! vimwiki#base#system_open_link(url)
   " handlers
   function! s:win32_handler(url)
     "http://vim.wikia.com/wiki/Opening_current_Vim_file_in_your_Windows_browser
@@ -255,10 +252,10 @@ function! vimwiki#base#system_open_link(url) "{{{
     endif
   endtry
   echomsg 'Vimwiki Error: Default Vimwiki link handler was unable to open the HTML file!'
-endfunction "}}}
+endfunction
 
-" vimwiki#base#open_link
-function! vimwiki#base#open_link(cmd, link, ...) "{{{
+
+function! vimwiki#base#open_link(cmd, link, ...)
   let link_infos = {}
   if a:0
     let link_infos = vimwiki#base#resolve_link(a:link, a:1)
@@ -271,8 +268,7 @@ function! vimwiki#base#open_link(cmd, link, ...) "{{{
     return
   endif
 
-  let is_wiki_link = link_infos.scheme =~# '\mwiki\d\+'
-        \ || link_infos.scheme =~# 'diary'
+  let is_wiki_link = link_infos.scheme =~# '\mwiki\d\+' || link_infos.scheme =~# 'diary'
 
   let update_prev_link = is_wiki_link &&
         \ !vimwiki#path#is_equal(link_infos.filename, vimwiki#path#current_wiki_file())
@@ -294,14 +290,15 @@ function! vimwiki#base#open_link(cmd, link, ...) "{{{
   else
     call vimwiki#base#system_open_link(link_infos.filename)
   endif
-endfunction " }}}
+endfunction
 
-" vimwiki#base#get_globlinks_escaped
-function! vimwiki#base#get_globlinks_escaped() abort "{{{only get links from the current dir
+
+function! vimwiki#base#get_globlinks_escaped() abort
+  " only get links from the current dir
   " change to the directory of the current file
   let orig_pwd = getcwd()
   lcd! %:h
-  " all path are relative to the current file's location 
+  " all path are relative to the current file's location
   let globlinks = glob('*'.vimwiki#vars#get_wikilocal('ext'), 1)."\n"
   " remove extensions
   let globlinks = substitute(globlinks, '\'.vimwiki#vars#get_wikilocal('ext').'\ze\n', '', 'g')
@@ -315,17 +312,16 @@ function! vimwiki#base#get_globlinks_escaped() abort "{{{only get links from the
   let globlinks = join(lst, "\n")
   " return all escaped links as a single newline-separated string
   return globlinks
-endfunction " }}}
+endfunction
 
-" vimwiki#base#generate_links
-function! vimwiki#base#generate_links() "{{{
+
+function! vimwiki#base#generate_links()
   let lines = []
 
   let links = vimwiki#base#get_wikilinks(vimwiki#vars#get_bufferlocal('wiki_nr'), 0)
   call sort(links)
 
-  let bullet = repeat(' ', vimwiki#lst#get_list_margin()).
-        \ vimwiki#lst#default_symbol().' '
+  let bullet = repeat(' ', vimwiki#lst#get_list_margin()) . vimwiki#lst#default_symbol().' '
   for link in links
     let abs_filepath = vimwiki#path#abs_path_of_link(link)
     if !s:is_diary_file(abs_filepath)
@@ -337,22 +333,21 @@ function! vimwiki#base#generate_links() "{{{
 
   let links_rx = '\m^\s*'.vimwiki#u#escape(vimwiki#lst#default_symbol()).' '
 
-  call vimwiki#base#update_listing_in_buffer(lines, 'Generated Links', links_rx,
-        \ line('$')+1, 1)
-endfunction " }}}
+  call vimwiki#base#update_listing_in_buffer(lines, 'Generated Links', links_rx, line('$')+1, 1)
+endfunction
 
-" vimwiki#base#goto
-function! vimwiki#base#goto(...) "{{{
+
+function! vimwiki#base#goto(...)
   let key = a:1
   let anchor = a:0 > 1 ? a:2 : ''
 
   call vimwiki#base#edit_file(':e',
         \ vimwiki#vars#get_wikilocal('path') . key . vimwiki#vars#get_wikilocal('ext'),
         \ anchor)
-endfunction "}}}
+endfunction
 
-" vimwiki#base#backlinks
-function! vimwiki#base#backlinks() "{{{
+
+function! vimwiki#base#backlinks()
   let current_filename = expand("%:p")
   let locations = []
   for idx in range(vimwiki#vars#number_of_wikis())
@@ -376,7 +371,8 @@ function! vimwiki#base#backlinks() "{{{
     call setloclist(0, locations, 'r')
     lopen
   endif
-endfunction "}}}
+endfunction
+
 
 " Returns: a list containing all files of the given wiki as absolute file path.
 " If the given wiki number is negative, the diary of the current wiki is used
@@ -386,7 +382,8 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
   if wiki_nr >= 0
     let root_directory = vimwiki#vars#get_wikilocal('path', wiki_nr)
   else
-    let root_directory = vimwiki#vars#get_wikilocal('path') . vimwiki#vars#get_wikilocal('diary_rel_path')
+    let root_directory = vimwiki#vars#get_wikilocal('path') .
+          \ vimwiki#vars#get_wikilocal('diary_rel_path')
     let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
   endif
   if a:directories_only
@@ -405,6 +402,7 @@ function! vimwiki#base#find_files(wiki_nr, directories_only)
   return split(globpath(root_directory, pattern), '\n')
 endfunction
 
+
 " Returns: a list containing the links to get from the current file to all wiki
 " files in the given wiki.
 " If the given wiki number is negative, the diary of the current wiki is used.
@@ -439,6 +437,7 @@ function! vimwiki#base#get_wikilinks(wiki_nr, also_absolute_links)
   return result
 endfunction
 
+
 " Returns: a list containing the links to all directories from the current file
 function! vimwiki#base#get_wiki_directories(wiki_nr)
   let dirs = vimwiki#base#find_files(a:wiki_nr, 1)
@@ -460,7 +459,8 @@ function! vimwiki#base#get_wiki_directories(wiki_nr)
   return result
 endfunction
 
-function! vimwiki#base#get_anchors(filename, syntax) "{{{
+
+function! vimwiki#base#get_anchors(filename, syntax)
   if !filereadable(a:filename)
     return []
   endif
@@ -531,10 +531,10 @@ function! vimwiki#base#get_anchors(filename, syntax) "{{{
   endfor
 
   return anchors
-endfunction "}}}
+endfunction
 
-" s:jump_to_anchor
-function! s:jump_to_anchor(anchor) "{{{
+
+function! s:jump_to_anchor(anchor)
   let oldpos = getpos('.')
   call cursor(1, 1)
 
@@ -554,21 +554,20 @@ function! s:jump_to_anchor(anchor) "{{{
           \ vimwiki#vars#get_syntaxlocal('tag_match'),
           \ '__Tag__', segment, '')
 
-    if         !search(anchor_tag, 'Wc')
-          \ && !search(anchor_header, 'Wc')
-          \ && !search(anchor_bold, 'Wc')
+    if !search(anchor_tag, 'Wc') && !search(anchor_header, 'Wc') && !search(anchor_bold, 'Wc')
       call setpos('.', oldpos)
       break
     endif
     let oldpos = getpos('.')
   endfor
-endfunction "}}}
+endfunction
+
 
 " Params: full path to a wiki file and its wiki number
 " Returns: a list of all links inside the wiki file
 " Every list item has the form
 " [target file, anchor, line number of the link in source file, column number]
-function! s:get_links(wikifile, idx) "{{{
+function! s:get_links(wikifile, idx)
   if !filereadable(a:wikifile)
     return []
   endif
@@ -590,17 +589,17 @@ function! s:get_links(wikifile, idx) "{{{
       endif
       let link_count += 1
       let target = vimwiki#base#resolve_link(link_text, a:wikifile)
-      if target.filename != '' &&
-            \ target.scheme =~# '\mwiki\d\+\|diary\|file\|local'
+      if target.filename != '' && target.scheme =~# '\mwiki\d\+\|diary\|file\|local'
         call add(links, [target.filename, target.anchor, lnum, col])
       endif
     endwhile
   endfor
 
   return links
-endfunction "}}}
+endfunction
 
-function! vimwiki#base#check_links() "{{{
+
+function! vimwiki#base#check_links()
   let anchors_of_files = {}
   let links_of_files = {}
   let errors = []
@@ -659,8 +658,8 @@ function! vimwiki#base#check_links() "{{{
 
   " mark every index file as reachable
   for idx in range(vimwiki#vars#number_of_wikis())
-    let index_file = vimwiki#vars#get_wikilocal('path', idx) . vimwiki#vars#get_wikilocal('index', idx) .
-          \ vimwiki#vars#get_wikilocal('ext', idx)
+    let index_file = vimwiki#vars#get_wikilocal('path', idx) .
+          \ vimwiki#vars#get_wikilocal('index', idx) . vimwiki#vars#get_wikilocal('ext', idx)
     if filereadable(index_file)
       let reachable_wikifiles[index_file] = 1
     endif
@@ -697,10 +696,10 @@ function! vimwiki#base#check_links() "{{{
     call setqflist(errors, 'r')
     copen
   endif
-endfunction "}}}
+endfunction
 
-" vimwiki#base#edit_file
-function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
+
+function! vimwiki#base#edit_file(command, filename, anchor, ...)
   let fname = escape(a:filename, '% *|#`')
   let dir = fnamemodify(a:filename, ":p:h")
 
@@ -751,19 +750,19 @@ function! vimwiki#base#edit_file(command, filename, anchor, ...) "{{{
   if a:0 && a:2 && len(a:1) > 0
     call vimwiki#vars#set_bufferlocal('prev_link', a:1)
   endif
-endfunction " }}}
+endfunction
 
-" vimwiki#base#search_word
-function! vimwiki#base#search_word(wikiRx, cmd) "{{{
+
+function! vimwiki#base#search_word(wikiRx, cmd)
   let match_line = search(a:wikiRx, 's'.a:cmd)
   if match_line == 0
     echomsg 'Vimwiki: Wiki link not found'
   endif
-endfunction " }}}
+endfunction
+
 
-" vimwiki#base#matchstr_at_cursor
 " Returns part of the line that matches wikiRX at cursor
-function! vimwiki#base#matchstr_at_cursor(wikiRX) "{{{
+function! vimwiki#base#matchstr_at_cursor(wikiRX)
   let col = col('.') - 1
   let line = getline('.')
   let ebeg = -1
@@ -783,10 +782,10 @@ function! vimwiki#base#matchstr_at_cursor(wikiRX) "{{{
   else
     return ""
   endif
-endf "}}}
+endfunction
 
-" vimwiki#base#replacestr_at_cursor
-function! vimwiki#base#replacestr_at_cursor(wikiRX, sub) "{{{
+
+function! vimwiki#base#replacestr_at_cursor(wikiRX, sub)
   let col = col('.') - 1
   let line = getline('.')
   let ebeg = -1
@@ -806,10 +805,10 @@ function! vimwiki#base#replacestr_at_cursor(wikiRX, sub) "{{{
     let newline = strpart(line, 0, ebeg).a:sub.strpart(line, ebeg+elen)
     call setline(line('.'), newline)
   endif
-endf "}}}
+endfunction
 
-" s:print_wiki_list
-function! s:print_wiki_list() "{{{
+
+function! s:print_wiki_list()
   let idx = 0
   while idx < vimwiki#vars#number_of_wikis()
     if idx == vimwiki#vars#get_bufferlocal('wiki_nr')
@@ -823,10 +822,10 @@ function! s:print_wiki_list() "{{{
     let idx += 1
   endwhile
   echohl None
-endfunction " }}}
+endfunction
 
-" s:update_wiki_link
-function! s:update_wiki_link(fname, old, new) " {{{
+
+function! s:update_wiki_link(fname, old, new)
   echo "Updating links in ".a:fname
   let has_updates = 0
   let dest = []
@@ -843,32 +842,33 @@ function! s:update_wiki_link(fname, old, new) " {{{
     call writefile(dest, a:fname)
     call delete(a:fname.'#vimwiki_upd#')
   endif
-endfunction " }}}
+endfunction
 
-" s:update_wiki_links_dir
-function! s:update_wiki_links_dir(dir, old_fname, new_fname) " {{{
+
+function! s:update_wiki_links_dir(dir, old_fname, new_fname)
   let old_fname = substitute(a:old_fname, '[/\\]', '[/\\\\]', 'g')
   let new_fname = a:new_fname
 
   let old_fname_r = vimwiki#base#apply_template(
         \ vimwiki#vars#get_syntaxlocal('WikiLinkMatchUrlTemplate'), old_fname, '', '')
 
-  let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.vimwiki#vars#get_wikilocal('ext')), '\n')
+  let files = split(glob(vimwiki#vars#get_wikilocal('path').a:dir.'*'.
+        \ vimwiki#vars#get_wikilocal('ext')), '\n')
   for fname in files
     call s:update_wiki_link(fname, old_fname_r, new_fname)
   endfor
-endfunction " }}}
+endfunction
 
-" s:tail_name
-function! s:tail_name(fname) "{{{
+
+function! s:tail_name(fname)
   let result = substitute(a:fname, ":", "__colon__", "g")
   let result = fnamemodify(result, ":t:r")
   let result = substitute(result, "__colon__", ":", "g")
   return result
-endfunction "}}}
+endfunction
 
-" s:update_wiki_links
-function! s:update_wiki_links(old_fname, new_fname) " {{{
+
+function! s:update_wiki_links(old_fname, new_fname)
   let old_fname = a:old_fname
   let new_fname = a:new_fname
 
@@ -894,14 +894,13 @@ function! s:update_wiki_links(old_fname, new_fname) " {{{
   while idx < len(dirs_keys)
     let dir = dirs_keys[idx]
     let new_dir = dirs_vals[idx]
-    call s:update_wiki_links_dir(dir, 
-          \ new_dir.old_fname, new_dir.new_fname)
+    call s:update_wiki_links_dir(dir, new_dir.old_fname, new_dir.new_fname)
     let idx = idx + 1
   endwhile
-endfunction " }}}
+endfunction
 
-" s:get_wiki_buffers
-function! s:get_wiki_buffers() "{{{
+
+function! s:get_wiki_buffers()
   let blist = []
   let bcount = 1
   while bcount<=bufnr("$")
@@ -917,18 +916,18 @@ function! s:get_wiki_buffers() "{{{
     let bcount = bcount + 1
   endwhile
   return blist
-endfunction " }}}
+endfunction
 
-" s:open_wiki_buffer
-function! s:open_wiki_buffer(item) "{{{
+
+function! s:open_wiki_buffer(item)
   call vimwiki#base#edit_file(':e', a:item[0], '')
   if !empty(a:item[1])
     call vimwiki#vars#set_bufferlocal('prev_link', a:item[1], a:item[0])
   endif
-endfunction " }}}
+endfunction
 
-" vimwiki#base#nested_syntax
-function! vimwiki#base#nested_syntax(filetype, start, end, textSnipHl) abort "{{{
+
+function! vimwiki#base#nested_syntax(filetype, start, end, textSnipHl) abort
 " From http://vim.wikia.com/wiki/VimTip857
   let ft=toupper(a:filetype)
   let group='textGroup'.ft
@@ -975,14 +974,15 @@ function! vimwiki#base#nested_syntax(filetype, start, end, textSnipHl) abort "{{
   " regular one.
   " Perl syntax file has perlFunctionName which is usually has no effect due to
   " 'contained' flag. Now we have 'syntax include' that makes all the groups
-  " included as 'contained' into specific group. 
+  " included as 'contained' into specific group.
   " Here perlFunctionName (with quite an angry regexp "\h\w*[^:]") clashes with
   " the rest syntax rules as now it has effect being really 'contained'.
   " Clear it!
   if ft =~? 'perl'
-    syntax clear perlFunctionName 
+    syntax clear perlFunctionName
   endif
-endfunction "}}}
+endfunction
+
 
 " creates or updates auto-generated listings in a wiki file, like TOC, diary
 " links, tags list etc.
@@ -993,7 +993,7 @@ endfunction "}}}
 " - if a:create is true, it will be created if it doesn't exist, otherwise it
 "   will only be updated if it already exists
 function! vimwiki#base#update_listing_in_buffer(strings, start_header,
-      \ content_regex, default_lnum, create) "{{{
+      \ content_regex, default_lnum, create)
   " apparently, Vim behaves strange when files change while in diff mode
   if &diff || &readonly
     return
@@ -1002,9 +1002,8 @@ function! vimwiki#base#update_listing_in_buffer(strings, start_header,
   " check if the listing is already there
   let already_there = 0
 
-  let header_rx = '\m^\s*'.
-        \ substitute(vimwiki#vars#get_syntaxlocal('rxH1_Template'), '__Header__', a:start_header, '')
-        \ .'\s*$'
+  let header_rx = '\m^\s*'.substitute(vimwiki#vars#get_syntaxlocal('rxH1_Template'),
+        \ '__Header__', a:start_header, '') .'\s*$'
 
   let start_lnum = 1
   while start_lnum <= line('$')
@@ -1080,27 +1079,26 @@ function! vimwiki#base#update_listing_in_buffer(strings, start_header,
     let winview_save.lnum += lines_diff
   endif
   call winrestview(winview_save)
-endfunction "}}}
+endfunction
 
-" WIKI link following functions {{{
-" vimwiki#base#find_next_link
-function! vimwiki#base#find_next_link() "{{{
+
+function! vimwiki#base#find_next_link()
   call vimwiki#base#search_word(vimwiki#vars#get_syntaxlocal('rxAnyLink'), '')
-endfunction " }}}
+endfunction
 
-" vimwiki#base#find_prev_link
-function! vimwiki#base#find_prev_link() "{{{
+
+function! vimwiki#base#find_prev_link()
   "Jump 2 times if the cursor is in the middle of a link
   if synIDattr(synID(line('.'), col('.'), 0), "name") =~# "VimwikiLink.*" &&
         \ synIDattr(synID(line('.'), col('.')-1, 0), "name") =~# "VimwikiLink.*"
     call vimwiki#base#search_word(vimwiki#vars#get_syntaxlocal('rxAnyLink'), 'b')
   endif
   call vimwiki#base#search_word(vimwiki#vars#get_syntaxlocal('rxAnyLink'), 'b')
-endfunction " }}}
+endfunction
+
 
-" vimwiki#base#follow_link
 " This is an API function, that is, remappable by the user. Don't change the signature.
-function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
+function! vimwiki#base#follow_link(split, reuse, move_cursor, ...)
   " Parse link at cursor and pass to VimwikiLinkHandler, or failing that, the
   " default open_link handler
 
@@ -1171,14 +1169,14 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...) "{{{
   else
     if a:0 > 0
       execute "normal! ".a:1
-    else		
+    else
       call vimwiki#base#normalize_link(0)
     endif
   endif
-endfunction " }}}
+endfunction
 
-" vimwiki#base#go_back_link
-function! vimwiki#base#go_back_link() "{{{
+
+function! vimwiki#base#go_back_link()
   let prev_link = vimwiki#vars#get_bufferlocal('prev_link')
   if !empty(prev_link)
     " go back to saved wiki link
@@ -1188,10 +1186,10 @@ function! vimwiki#base#go_back_link() "{{{
     " maybe we came here by jumping to a tag -> pop from the tag stack
     silent! pop!
   endif
-endfunction " }}}
+endfunction
 
-" vimwiki#base#goto_index
-function! vimwiki#base#goto_index(wnum, ...) "{{{
+
+function! vimwiki#base#goto_index(wnum, ...)
   if a:wnum > vimwiki#vars#number_of_wikis()
     echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in your Vimwiki settings!'
     return
@@ -1222,12 +1220,11 @@ function! vimwiki#base#goto_index(wnum, ...) "{{{
         \ vimwiki#vars#get_wikilocal('ext', idx)
 
   call vimwiki#base#edit_file(cmd, index_file, '')
-endfunction "}}}
+endfunction
 
-" vimwiki#base#delete_link
-function! vimwiki#base#delete_link() "{{{
-  "" file system funcs
-  "" Delete wiki link you are in from filesystem
+
+function! vimwiki#base#delete_link()
+  " Delete wiki file you are in from filesystem
   let val = input('Delete "'.expand('%').'" [y]es/[N]o? ')
   if val !~? '^y'
     return
@@ -1247,11 +1244,11 @@ function! vimwiki#base#delete_link() "{{{
   if expand('%:p') != ""
     execute "e"
   endif
-endfunction "}}}
+endfunction
+
 
-" vimwiki#base#rename_link
 " Rename current file, update all links to it
-function! vimwiki#base#rename_link() "{{{
+function! vimwiki#base#rename_link()
   let subdir = vimwiki#vars#get_bufferlocal('subdir')
   let old_fname = subdir.expand('%:t')
 
@@ -1285,15 +1282,14 @@ function! vimwiki#base#rename_link() "{{{
   if url != ''
     let new_link = url
   endif
-  
+
   let new_link = subdir.new_link
   let new_fname = vimwiki#vars#get_wikilocal('path') . new_link . vimwiki#vars#get_wikilocal('ext')
 
   " do not rename if file with such name exists
   let fname = glob(new_fname)
   if fname != ''
-    echomsg 'Vimwiki Error: Cannot rename to "'.new_fname.
-          \ '". File with that name exist!'
+    echomsg 'Vimwiki Error: Cannot rename to "'.new_fname.'". File with that name exist!'
     return
   endif
   " rename wiki link file
@@ -1310,8 +1306,7 @@ function! vimwiki#base#rename_link() "{{{
 
   let &buftype="nofile"
 
-  let cur_buffer = [expand('%:p'),
-        \ vimwiki#vars#get_bufferlocal('prev_link')]
+  let cur_buffer = [expand('%:p'), vimwiki#vars#get_bufferlocal('prev_link')]
 
   let blist = s:get_wiki_buffers()
 
@@ -1341,27 +1336,24 @@ function! vimwiki#base#rename_link() "{{{
     endif
   endfor
 
-  call s:open_wiki_buffer([new_fname,
-        \ cur_buffer[1]])
+  call s:open_wiki_buffer([new_fname, cur_buffer[1]])
   " execute 'bwipeout '.escape(cur_buffer[0], ' ')
 
   echomsg 'Vimwiki: '.old_fname.' is renamed to '.new_fname
 
   let &more = setting_more
-endfunction " }}}
+endfunction
 
-" vimwiki#base#ui_select
-function! vimwiki#base#ui_select() "{{{
+
+function! vimwiki#base#ui_select()
   call s:print_wiki_list()
   let idx = input("Select Wiki (specify number): ")
   if idx == ""
     return
   endif
   call vimwiki#base#goto_index(idx)
-endfunction "}}}
-" }}}
+endfunction
 
-" TEXT OBJECTS functions {{{
 
 function! vimwiki#base#TO_header(inner, including_subheaders, count)
   let headers = s:collect_headers()
@@ -1416,8 +1408,7 @@ function! vimwiki#base#TO_header(inner, including_subheaders, count)
 endfunction
 
 
-" vimwiki#base#TO_table_cell
-function! vimwiki#base#TO_table_cell(inner, visual) "{{{
+function! vimwiki#base#TO_table_cell(inner, visual)
   if col('.') == col('$')-1
     return
   endif
@@ -1461,7 +1452,7 @@ function! vimwiki#base#TO_table_cell(inner, visual) "{{{
 
     " XXX: WORKAROUND.
     " if blockwise selection is ended at | character then pressing j to extend
-    " selection furhter fails. But if we shake the cursor left and right then
+    " selection further fails. But if we shake the cursor left and right then
     " it works.
     normal! hl
   else
@@ -1479,10 +1470,10 @@ function! vimwiki#base#TO_table_cell(inner, visual) "{{{
       normal! 2h
     endif
   endif
-endfunction "}}}
+endfunction
 
-" vimwiki#base#TO_table_col
-function! vimwiki#base#TO_table_col(inner, visual) "{{{
+
+function! vimwiki#base#TO_table_col(inner, visual)
   let t_rows = vimwiki#tbl#get_rows(line('.'))
   if empty(t_rows)
     return
@@ -1594,12 +1585,10 @@ function! vimwiki#base#TO_table_col(inner, visual) "{{{
     " expand selection to the bottom line of the table
     call vimwiki#u#cursor(t_rows[-1][0], virtcol('.'))
   endif
-endfunction "}}}
-" }}}
+endfunction
 
-" HEADER functions {{{
-" vimwiki#base#AddHeaderLevel
-function! vimwiki#base#AddHeaderLevel() "{{{
+
+function! vimwiki#base#AddHeaderLevel()
   let lnum = line('.')
   let line = getline(lnum)
   let rxHdr = vimwiki#vars#get_syntaxlocal('rxH')
@@ -1618,16 +1607,16 @@ function! vimwiki#base#AddHeaderLevel() "{{{
       call setline(lnum, line)
     endif
   else
-    let line = substitute(line, '^\s*', '&'.rxHdr.' ', '') 
+    let line = substitute(line, '^\s*', '&'.rxHdr.' ', '')
     if vimwiki#vars#get_syntaxlocal('symH')
       let line = substitute(line, '\s*$', ' '.rxHdr.'&', '')
     endif
     call setline(lnum, line)
   endif
-endfunction "}}}
+endfunction
 
-" vimwiki#base#RemoveHeaderLevel
-function! vimwiki#base#RemoveHeaderLevel() "{{{
+
+function! vimwiki#base#RemoveHeaderLevel()
   let lnum = line('.')
   let line = getline(lnum)
   let rxHdr = vimwiki#vars#get_syntaxlocal('rxH')
@@ -1657,7 +1646,8 @@ function! vimwiki#base#RemoveHeaderLevel() "{{{
 
     call setline(lnum, line)
   endif
-endfunction " }}}
+endfunction
+
 
 
 " Returns all the headers in the current buffer as a list of the form
@@ -1687,7 +1677,8 @@ function! s:collect_headers()
       continue
     endif
     let header_level = vimwiki#u#count_first_sym(line_content)
-    let header_text = vimwiki#u#trim(matchstr(line_content, vimwiki#vars#get_syntaxlocal('rxHeader')))
+    let header_text =
+          \ vimwiki#u#trim(matchstr(line_content, vimwiki#vars#get_syntaxlocal('rxHeader')))
     call add(headers, [lnum, header_level, header_text])
   endfor
 
@@ -1774,7 +1765,8 @@ endfunction
 function! vimwiki#base#goto_sibling(direction)
   let headers = s:collect_headers()
   let current_header_index = s:current_header(headers, line('.'))
-  let next_potential_sibling = s:get_another_header(headers, current_header_index, a:direction, '<=')
+  let next_potential_sibling =
+        \ s:get_another_header(headers, current_header_index, a:direction, '<=')
   if next_potential_sibling >= 0 && headers[next_potential_sibling][1] ==
         \ headers[current_header_index][1]
     call cursor(headers[next_potential_sibling][0], 1)
@@ -1832,19 +1824,17 @@ function! vimwiki#base#table_of_contents(create)
 
   let links_rx = '\m^\s*'.vimwiki#u#escape(vimwiki#lst#default_symbol()).' '
 
-  call vimwiki#base#update_listing_in_buffer(lines, vimwiki#vars#get_global('toc_header'), links_rx,
-        \ 1, a:create)
+  call vimwiki#base#update_listing_in_buffer(lines,
+        \ vimwiki#vars#get_global('toc_header'), links_rx, 1, a:create)
 endfunction
-"}}}
 
-" LINK functions {{{
-" vimwiki#base#apply_template
+
 "   Construct a regular expression matching from template (with special
 "   characters properly escaped), by substituting rxUrl for __LinkUrl__, rxDesc
 "   for __LinkDescription__, and rxStyle for __LinkStyle__.  The three
 "   arguments rxUrl, rxDesc, and rxStyle are copied verbatim, without any
 "   special character escapes or substitutions.
-function! vimwiki#base#apply_template(template, rxUrl, rxDesc, rxStyle) "{{{
+function! vimwiki#base#apply_template(template, rxUrl, rxDesc, rxStyle)
   let lnk = a:template
   if a:rxUrl != ""
     let lnk = s:safesubstitute(lnk, '__LinkUrl__', a:rxUrl, 'g')
@@ -1856,10 +1846,10 @@ function! vimwiki#base#apply_template(template, rxUrl, rxDesc, rxStyle) "{{{
     let lnk = s:safesubstitute(lnk, '__LinkStyle__', a:rxStyle, 'g')
   endif
   return lnk
-endfunction " }}}
+endfunction
 
-" s:clean_url
-function! s:clean_url(url) " {{{
+
+function! s:clean_url(url)
   let url = split(a:url, '/\|=\|-\|&\|?\|\.')
   let url = filter(url, 'v:val !=# ""')
   let url = filter(url, 'v:val !=# "www"')
@@ -1872,19 +1862,18 @@ function! s:clean_url(url) " {{{
   let url = filter(url, 'v:val !=# "file\:"')
   let url = filter(url, 'v:val !=# "xml\:"')
   return join(url, " ")
-endfunction " }}}
+endfunction
 
-" s:is_diary_file
-function! s:is_diary_file(filename) " {{{
+
+function! s:is_diary_file(filename)
   let file_path = vimwiki#path#path_norm(a:filename)
   let rel_path = vimwiki#vars#get_wikilocal('diary_rel_path')
   let diary_path = vimwiki#path#path_norm(vimwiki#vars#get_wikilocal('path') . rel_path)
-  return rel_path != ''
-        \ && file_path =~# '^'.vimwiki#u#escape(diary_path)
-endfunction " }}}
+  return rel_path != '' && file_path =~# '^'.vimwiki#u#escape(diary_path)
+endfunction
 
-" vimwiki#base#normalize_link_helper
-function! vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template) " {{{
+
+function! vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template)
   let url = matchstr(a:str, a:rxUrl)
   let descr = matchstr(a:str, a:rxDesc)
   if descr == ""
@@ -1893,18 +1882,18 @@ function! vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template) " {{{
   let lnk = s:safesubstitute(a:template, '__LinkDescription__', descr, '')
   let lnk = s:safesubstitute(lnk, '__LinkUrl__', url, '')
   return lnk
-endfunction " }}}
+endfunction
 
-" vimwiki#base#normalize_imagelink_helper
-function! vimwiki#base#normalize_imagelink_helper(str, rxUrl, rxDesc, rxStyle, template) "{{{
+
+function! vimwiki#base#normalize_imagelink_helper(str, rxUrl, rxDesc, rxStyle, template)
   let lnk = vimwiki#base#normalize_link_helper(a:str, a:rxUrl, a:rxDesc, a:template)
   let style = matchstr(a:str, a:rxStyle)
   let lnk = s:safesubstitute(lnk, '__LinkStyle__', style, '')
   return lnk
-endfunction " }}}
+endfunction
 
-" s:normalize_link_in_diary
-function! s:normalize_link_in_diary(lnk) " {{{
+
+function! s:normalize_link_in_diary(lnk)
   let link = a:lnk . vimwiki#vars#get_wikilocal('ext')
   let link_wiki = vimwiki#vars#get_wikilocal('path') . '/' . link
   let link_diary = vimwiki#vars#get_wikilocal('path') . '/'
@@ -1927,21 +1916,22 @@ function! s:normalize_link_in_diary(lnk) " {{{
   endif
 
   return vimwiki#base#normalize_link_helper(str, rxUrl, rxDesc, template)
-endfunction " }}}
+endfunction
 
-" s:normalize_link_syntax_n
-function! s:normalize_link_syntax_n() " {{{
+
+function! s:normalize_link_syntax_n()
 
   " try WikiLink
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_global('WikiLinkTemplate2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink'), sub)
     return
   endif
-  
+
   " try WikiIncl
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_global('rxWikiIncl'))
   if !empty(lnk)
@@ -1974,10 +1964,10 @@ function! s:normalize_link_syntax_n() " {{{
     return
   endif
 
-endfunction " }}}
+endfunction
 
-" s:normalize_link_syntax_v
-function! s:normalize_link_syntax_v() " {{{
+
+function! s:normalize_link_syntax_v()
   let sel_save = &selection
   let &selection = "old"
   let default_register_save = @"
@@ -2002,10 +1992,10 @@ function! s:normalize_link_syntax_v() " {{{
     call setreg('"', default_register_save, registertype_save)
     let &selection = sel_save
   endtry
-endfunction " }}}
+endfunction
 
-" vimwiki#base#normalize_link
-function! vimwiki#base#normalize_link(is_visual_mode) "{{{
+
+function! vimwiki#base#normalize_link(is_visual_mode)
   if exists('*vimwiki#'.vimwiki#vars#get_wikilocal('syntax').'_base#normalize_link')
     " Syntax-specific links
     call vimwiki#{vimwiki#vars#get_wikilocal('syntax')}_base#normalize_link(a:is_visual_mode)
@@ -2017,10 +2007,10 @@ function! vimwiki#base#normalize_link(is_visual_mode) "{{{
       call s:normalize_link_syntax_v()
     endif
   endif
-endfunction "}}}
+endfunction
 
-" vimwiki#base#detect_nested_syntax
-function! vimwiki#base#detect_nested_syntax() "{{{
+
+function! vimwiki#base#detect_nested_syntax()
   let last_word = '\v.*<(\w+)\s*$'
   let lines = map(filter(getline(1, "$"), 'v:val =~ "\\%({{{\\|```\\)" && v:val =~ last_word'),
         \ 'substitute(v:val, last_word, "\\=submatch(1)", "")')
@@ -2029,26 +2019,20 @@ function! vimwiki#base#detect_nested_syntax() "{{{
     let dict[elem] = elem
   endfor
   return dict
-endfunction "}}}
+endfunction
 
-" }}}
 
-" Command completion functions {{{
-
-" vimwiki#base#complete_links_escaped
-function! vimwiki#base#complete_links_escaped(ArgLead, CmdLine, CursorPos) abort " {{{
+function! vimwiki#base#complete_links_escaped(ArgLead, CmdLine, CursorPos) abort
   " We can safely ignore args if we use -custom=complete option, Vim engine
   " will do the job of filtering.
   return vimwiki#base#get_globlinks_escaped()
-endfunction " }}}
+endfunction
 
-"}}}
 
 " -------------------------------------------------------------------------
 " Load syntax-specific Wiki functionality
 for s:syn in s:vimwiki_get_known_syntaxes()
   execute 'runtime! autoload/vimwiki/'.s:syn.'_base.vim'
-endfor 
+endfor
 " -------------------------------------------------------------------------
 
-
diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 7b0de30..278da34 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -1,44 +1,49 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Handle diary notes
+" Description: Handle diary notes
 " Home: https://github.com/vimwiki/vimwiki/
 
-" Load only once {{{
+
 if exists("g:loaded_vimwiki_diary_auto") || &cp
   finish
 endif
 let g:loaded_vimwiki_diary_auto = 1
-"}}}
+
 
 let s:vimwiki_max_scan_for_caption = 5
 
-" Helpers {{{
-function! s:prefix_zero(num) "{{{
+
+function! s:prefix_zero(num)
   if a:num < 10
     return '0'.a:num
   endif
   return a:num
-endfunction "}}}
+endfunction
 
-function! s:diary_path(...) "{{{
+
+function! s:diary_path(...)
   let idx = a:0 == 0 ? vimwiki#vars#get_bufferlocal('wiki_nr') : a:1
   return vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx)
-endfunction "}}}
+endfunction
 
-function! s:diary_index(...) "{{{
+
+function! s:diary_index(...)
   let idx = a:0 == 0 ? vimwiki#vars#get_bufferlocal('wiki_nr') : a:1
-  return s:diary_path(idx).vimwiki#vars#get_wikilocal('diary_index', idx).vimwiki#vars#get_wikilocal('ext', idx)
-endfunction "}}}
+  return s:diary_path(idx).vimwiki#vars#get_wikilocal('diary_index', idx).
+        \ vimwiki#vars#get_wikilocal('ext', idx)
+endfunction
 
-function! vimwiki#diary#diary_date_link(...) "{{{
+
+function! vimwiki#diary#diary_date_link(...)
   if a:0
     return strftime('%Y-%m-%d', a:1)
   else
     return strftime('%Y-%m-%d')
   endif
-endfunction "}}}
+endfunction
 
-function! s:get_position_links(link) "{{{
+
+function! s:get_position_links(link)
   let idx = -1
   let links = []
   if a:link =~# '^\d\{4}-\d\d-\d\d'
@@ -51,16 +56,15 @@ function! s:get_position_links(link) "{{{
     let idx = index(links, a:link)
   endif
   return [idx, links]
-endfunction "}}}
+endfunction
 
-fun! s:get_month_name(month) "{{{
+
+function! s:get_month_name(month)
   return vimwiki#vars#get_global('diary_months')[str2nr(a:month)]
-endfun "}}}
+endfunction
 
-" Helpers }}}
 
-" Diary index stuff {{{
-fun! s:read_captions(files) "{{{
+function! s:read_captions(files)
   let result = {}
   let rx_header = vimwiki#vars#get_syntaxlocal('rxHeader')
   for fl in a:files
@@ -81,11 +85,13 @@ fun! s:read_captions(files) "{{{
 
   endfor
   return result
-endfun "}}}
+endfunction
 
-fun! s:get_diary_files() "{{{
+
+function! s:get_diary_files()
   let rx = '^\d\{4}-\d\d-\d\d'
-  let s_files = glob(vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').'*'.vimwiki#vars#get_wikilocal('ext'))
+  let s_files = glob(vimwiki#vars#get_wikilocal('path').
+        \ vimwiki#vars#get_wikilocal('diary_rel_path').'*'.vimwiki#vars#get_wikilocal('ext'))
   let files = split(s_files, '\n')
   call filter(files, 'fnamemodify(v:val, ":t") =~# "'.escape(rx, '\').'"')
 
@@ -93,9 +99,10 @@ fun! s:get_diary_files() "{{{
   call filter(files, 'v:val !~# ''.*\~$''')
 
   return files
-endfun "}}}
+endfunction
 
-fun! s:group_links(links) "{{{
+
+function! s:group_links(links)
   let result = {}
   let p_year = 0
   let p_month = 0
@@ -114,38 +121,43 @@ fun! s:group_links(links) "{{{
     let p_month = month
   endfor
   return result
-endfun "}}}
+endfunction
 
-function! s:sort(lst) "{{{
+
+function! s:sort(lst)
   if vimwiki#vars#get_wikilocal('diary_sort') ==? 'desc'
     return reverse(sort(a:lst))
   else
     return sort(a:lst)
   endif
-endfunction "}}}
+endfunction
 
-function! s:format_diary() "{{{
+
+function! s:format_diary()
   let result = []
 
-
   let links_with_captions = s:read_captions(s:get_diary_files())
   let g_files = s:group_links(links_with_captions)
 
   for year in s:sort(keys(g_files))
     call add(result, '')
-    call add(result, substitute(vimwiki#vars#get_syntaxlocal('rxH2_Template'), '__Header__', year , ''))
+    call add(result,
+          \ substitute(vimwiki#vars#get_syntaxlocal('rxH2_Template'), '__Header__', year , ''))
 
     for month in s:sort(keys(g_files[year]))
       call add(result, '')
-      call add(result, substitute(vimwiki#vars#get_syntaxlocal('rxH3_Template'), '__Header__', s:get_month_name(month), ''))
+      call add(result, substitute(vimwiki#vars#get_syntaxlocal('rxH3_Template'),
+            \ '__Header__', s:get_month_name(month), ''))
 
       for [fl, cap] in s:sort(items(g_files[year][month]))
         if empty(cap)
-          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', fl, '')
+          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
+                \ '__LinkUrl__', fl, '')
           let entry = substitute(entry, '__LinkDescription__', cap, '')
           call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
         else
-          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__', fl, '')
+          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'),
+                \ '__LinkUrl__', fl, '')
           let entry = substitute(entry, '__LinkDescription__', cap, '')
           call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
         endif
@@ -155,11 +167,10 @@ function! s:format_diary() "{{{
   endfor
 
   return result
-endfunction "}}}
+endfunction
 
-" Diary index stuff }}}
 
-function! vimwiki#diary#make_note(wnum, ...) "{{{
+function! vimwiki#diary#make_note(wnum, ...)
   if a:wnum > vimwiki#vars#number_of_wikis()
     echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in g:vimwiki_list!'
     return
@@ -172,7 +183,8 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
     let idx = 0
   endif
 
-  call vimwiki#path#mkdir(vimwiki#vars#get_wikilocal('path', idx).vimwiki#vars#get_wikilocal('diary_rel_path', idx))
+  call vimwiki#path#mkdir(vimwiki#vars#get_wikilocal('path', idx).
+        \ vimwiki#vars#get_wikilocal('diary_rel_path', idx))
 
   let cmd = 'edit'
   if a:0
@@ -191,9 +203,10 @@ function! vimwiki#diary#make_note(wnum, ...) "{{{
   endif
 
   call vimwiki#base#open_link(cmd, link, s:diary_index(idx))
-endfunction "}}}
+endfunction
 
-function! vimwiki#diary#goto_diary_index(wnum) "{{{
+
+function! vimwiki#diary#goto_diary_index(wnum)
   if a:wnum > vimwiki#vars#number_of_wikis()
     echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in g:vimwiki_list!'
     return
@@ -207,9 +220,10 @@ function! vimwiki#diary#goto_diary_index(wnum) "{{{
   endif
 
   call vimwiki#base#edit_file('e', s:diary_index(idx), '')
-endfunction "}}}
+endfunction
 
-function! vimwiki#diary#goto_next_day() "{{{
+
+function! vimwiki#diary#goto_next_day()
   let link = ''
   let [idx, links] = s:get_position_links(expand('%:t:r'))
 
@@ -227,9 +241,10 @@ function! vimwiki#diary#goto_next_day() "{{{
   if len(link)
     call vimwiki#base#open_link(':e ', link)
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#diary#goto_prev_day() "{{{
+
+function! vimwiki#diary#goto_prev_day()
   let link = ''
   let [idx, links] = s:get_position_links(expand('%:t:r'))
 
@@ -247,9 +262,10 @@ function! vimwiki#diary#goto_prev_day() "{{{
   if len(link)
     call vimwiki#base#open_link(':e ', link)
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#diary#generate_diary_section() "{{{
+
+function! vimwiki#diary#generate_diary_section()
   let current_file = vimwiki#path#path_norm(expand("%:p"))
   let diary_file = vimwiki#path#path_norm(s:diary_index())
   if vimwiki#path#is_equal(current_file, diary_file)
@@ -259,11 +275,11 @@ function! vimwiki#diary#generate_diary_section() "{{{
   else
     echomsg 'Vimwiki Error: You can generate diary links only in a diary index page!'
   endif
-endfunction "}}}
+endfunction
 
-" Calendar.vim {{{
-" Callback function.
-function! vimwiki#diary#calendar_action(day, month, year, week, dir) "{{{
+
+" Callback function for Calendar.vim
+function! vimwiki#diary#calendar_action(day, month, year, week, dir)
   let day = s:prefix_zero(a:day)
   let month = s:prefix_zero(a:month)
 
@@ -283,16 +299,14 @@ function! vimwiki#diary#calendar_action(day, month, year, week, dir) "{{{
 
   " XXX: Well, +1 is for inconsistent index basing...
   call vimwiki#diary#make_note(vimwiki#vars#get_bufferlocal('wiki_nr')+1, 0, link)
-endfunction "}}}
+endfunction
 
-" Sign function.
-function vimwiki#diary#calendar_sign(day, month, year) "{{{
+
+function vimwiki#diary#calendar_sign(day, month, year)
   let day = s:prefix_zero(a:day)
   let month = s:prefix_zero(a:month)
   let sfile = vimwiki#vars#get_wikilocal('path').vimwiki#vars#get_wikilocal('diary_rel_path').
         \ a:year.'-'.month.'-'.day.vimwiki#vars#get_wikilocal('ext')
   return filereadable(expand(sfile))
-endfunction "}}}
-
-" Calendar.vim }}}
+endfunction
 
diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 7ec27f3..6579109 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1,62 +1,57 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Export to HTML
+" Description: HTML export
 " Home: https://github.com/vimwiki/vimwiki/
 
-" TODO: We need vimwiki abstract syntax tree. If properly designed it wourld
-" greatly symplify different syntax to HTML generation.
-" 
-" vimwiki   --            --> PDF 
-"             \          /
-" markdown  -----> AST -----> HTML
-"             /          \
-" mediawiki --            --> Latex
-"
 
-" Load only once {{{
 if exists("g:loaded_vimwiki_html_auto") || &cp
   finish
 endif
 let g:loaded_vimwiki_html_auto = 1
-"}}}
 
-" UTILITY "{{{
-function! s:root_path(subdir) "{{{
+
+function! s:root_path(subdir)
   return repeat('../', len(split(a:subdir, '[/\\]')))
-endfunction "}}}
+endfunction
 
-function! s:syntax_supported() " {{{
+
+function! s:syntax_supported()
   return vimwiki#vars#get_wikilocal('syntax') ==? "default"
-endfunction " }}}
+endfunction
 
-function! s:remove_blank_lines(lines) " {{{
+
+function! s:remove_blank_lines(lines)
   while !empty(a:lines) && a:lines[-1] =~# '^\s*$'
     call remove(a:lines, -1)
   endwhile
-endfunction "}}}
+endfunction
 
-function! s:is_web_link(lnk) "{{{
+
+function! s:is_web_link(lnk)
   if a:lnk =~# '^\%(https://\|http://\|www.\|ftp://\|file://\|mailto:\)'
     return 1
   endif
   return 0
-endfunction "}}}
+endfunction
 
-function! s:is_img_link(lnk) "{{{
+
+function! s:is_img_link(lnk)
   if tolower(a:lnk) =~# '\.\%(png\|jpg\|gif\|jpeg\)$'
     return 1
   endif
   return 0
-endfunction "}}}
+endfunction
 
-function! s:has_abs_path(fname) "{{{
+
+function! s:has_abs_path(fname)
   if a:fname =~# '\(^.:\)\|\(^/\)'
     return 1
   endif
   return 0
-endfunction "}}}
+endfunction
 
-function! s:find_autoload_file(name) " {{{
+
+function! s:find_autoload_file(name)
   for path in split(&runtimepath, ',')
     let fname = path.'/autoload/vimwiki/'.a:name
     if glob(fname) != ''
@@ -64,15 +59,17 @@ function! s:find_autoload_file(name) " {{{
     endif
   endfor
   return ''
-endfunction " }}}
+endfunction
 
-function! s:default_CSS_full_name(path) " {{{
+
+function! s:default_CSS_full_name(path)
   let path = expand(a:path)
   let css_full_name = path . vimwiki#vars#get_wikilocal('css_name')
   return css_full_name
-endfunction "}}}
+endfunction
 
-function! s:create_default_CSS(path) " {{{
+
+function! s:create_default_CSS(path)
   let css_full_name = s:default_CSS_full_name(a:path)
   if glob(css_full_name) == ""
     call vimwiki#path#mkdir(fnamemodify(css_full_name, ':p:h'))
@@ -84,9 +81,10 @@ function! s:create_default_CSS(path) " {{{
     endif
   endif
   return 0
-endfunction "}}}
+endfunction
 
-function! s:template_full_name(name) "{{{
+
+function! s:template_full_name(name)
   if a:name == ''
     let name = vimwiki#vars#get_wikilocal('template_default')
   else
@@ -101,9 +99,10 @@ function! s:template_full_name(name) "{{{
   else
     return ''
   endif
-endfunction "}}}
+endfunction
 
-function! s:get_html_template(template) "{{{
+
+function! s:get_html_template(template)
   " TODO: refactor it!!!
   let lines=[]
 
@@ -113,8 +112,7 @@ function! s:get_html_template(template) "{{{
       let lines = readfile(template_name)
       return lines
     catch /E484/
-      echomsg 'Vimwiki: HTML template '.template_name.
-            \ ' does not exist!'
+      echomsg 'Vimwiki: HTML template '.template_name. ' does not exist!'
     endtry
   endif
 
@@ -126,13 +124,14 @@ function! s:get_html_template(template) "{{{
 
   let lines = readfile(default_tpl)
   return lines
-endfunction "}}}
+endfunction
 
-function! s:safe_html_preformatted(line) "{{{
+
+function! s:safe_html_preformatted(line)
   let line = substitute(a:line,'<','\&lt;', 'g')
   let line = substitute(line,'>','\&gt;', 'g')
   return line
-endfunction "}}}
+endfunction
 
 
 function! s:escape_html_attribute(string)
@@ -140,7 +139,7 @@ function! s:escape_html_attribute(string)
 endfunction
 
 
-function! s:safe_html_line(line) "{{{
+function! s:safe_html_line(line)
   " escape & < > when producing HTML text
   " s:lt_pattern, s:gt_pattern depend on g:vimwiki_valid_html_tags
   " and are set in vimwiki#html#Wiki2HTML()
@@ -149,9 +148,10 @@ function! s:safe_html_line(line) "{{{
   let line = substitute(line,s:gt_pattern,'\&gt;', 'g')
 
   return line
-endfunction "}}}
+endfunction
 
-function! s:delete_html_files(path) "{{{
+
+function! s:delete_html_files(path)
   let htmlfiles = split(glob(a:path.'**/*.html'), '\n')
   for fname in htmlfiles
     " ignore user html files, e.g. search.html,404.html
@@ -173,13 +173,15 @@ function! s:delete_html_files(path) "{{{
       echomsg 'Vimwiki Error: Cannot delete '.fname
     endtry
   endfor
-endfunction "}}}
+endfunction
 
-function! s:mid(value, cnt) "{{{
+
+function! s:mid(value, cnt)
   return strpart(a:value, a:cnt, len(a:value) - 2 * a:cnt)
-endfunction "}}}
+endfunction
 
-function! s:subst_func(line, regexp, func, ...) " {{{
+
+function! s:subst_func(line, regexp, func, ...)
   " Substitute text found by regexp with result of
   " func(matched) function.
 
@@ -199,16 +201,17 @@ function! s:subst_func(line, regexp, func, ...) " {{{
     let pos = matchend(a:line, a:regexp, pos)
   endfor
   return res_line
-endfunction " }}}
+endfunction
 
-function! s:save_vimwiki_buffer() "{{{
+
+function! s:save_vimwiki_buffer()
   if &filetype ==? 'vimwiki' && filewritable(expand('%'))
     silent update
   endif
-endfunction "}}}
+endfunction
 
-" get date.
-function! s:process_date(placeholders, default_date) "{{{
+
+function! s:process_date(placeholders, default_date)
   if !empty(a:placeholders)
     for [placeholder, row, idx] in a:placeholders
       let [type, param] = placeholder
@@ -218,10 +221,10 @@ function! s:process_date(placeholders, default_date) "{{{
     endfor
   endif
   return a:default_date
-endfunction "}}}
+endfunction
 
-" get title.
-function! s:process_title(placeholders, default_title) "{{{
+
+function! s:process_title(placeholders, default_title)
   if !empty(a:placeholders)
     for [placeholder, row, idx] in a:placeholders
       let [type, param] = placeholder
@@ -231,9 +234,10 @@ function! s:process_title(placeholders, default_title) "{{{
     endfor
   endif
   return a:default_title
-endfunction "}}}
+endfunction
 
-function! s:is_html_uptodate(wikifile) "{{{
+
+function! s:is_html_uptodate(wikifile)
   let tpl_time = -1
 
   let tpl_file = s:template_full_name('')
@@ -242,16 +246,17 @@ function! s:is_html_uptodate(wikifile) "{{{
   endif
 
   let wikifile = fnamemodify(a:wikifile, ":p")
-  let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') . vimwiki#vars#get_bufferlocal('subdir') .
-        \fnamemodify(wikifile, ":t:r").".html")
+  let htmlfile = expand(vimwiki#vars#get_wikilocal('path_html') .
+        \ vimwiki#vars#get_bufferlocal('subdir') . fnamemodify(wikifile, ":t:r").".html")
 
   if getftime(wikifile) <= getftime(htmlfile) && tpl_time <= getftime(htmlfile)
     return 1
   endif
   return 0
-endfunction "}}}
+endfunction
 
-function! s:html_insert_contents(html_lines, content) "{{{
+
+function! s:html_insert_contents(html_lines, content)
   let lines = []
   for line in a:html_lines
     if line =~# '%content%'
@@ -271,20 +276,21 @@ function! s:html_insert_contents(html_lines, content) "{{{
     endif
   endfor
   return lines
-endfunction "}}}
-"}}}
+endfunction
 
-" INLINE TAGS "{{{
-function! s:tag_eqin(value) "{{{
+
+function! s:tag_eqin(value)
   " mathJAX wants \( \) for inline maths
   return '\('.s:mid(a:value, 1).'\)'
-endfunction "}}}
+endfunction
 
-function! s:tag_em(value) "{{{
+
+function! s:tag_em(value)
   return '<em>'.s:mid(a:value, 1).'</em>'
-endfunction "}}}
+endfunction
 
-function! s:tag_strong(value, header_ids) "{{{
+
+function! s:tag_strong(value, header_ids)
   let text = s:mid(a:value, 1)
   let id = s:escape_html_attribute(text)
   let complete_id = ''
@@ -299,9 +305,10 @@ function! s:tag_strong(value, header_ids) "{{{
   let complete_id .= '-'.id
   return '<span id="'.s:escape_html_attribute(complete_id).'"></span><strong id="'
         \ .id.'">'.text.'</strong>'
-endfunction "}}}
+endfunction
 
-function! s:tag_tags(value, header_ids) "{{{
+
+function! s:tag_tags(value, header_ids)
   let complete_id = ''
   for level in range(6)
     if a:header_ids[level][0] != ''
@@ -320,79 +327,80 @@ function! s:tag_tags(value, header_ids) "{{{
           \ .id.'">'.tag.'</span>')
   endfor
   return join(result)
-endfunction "}}}
+endfunction
 
-function! s:tag_todo(value) "{{{
+
+function! s:tag_todo(value)
   return '<span class="todo">'.a:value.'</span>'
-endfunction "}}}
+endfunction
 
-function! s:tag_strike(value) "{{{
+
+function! s:tag_strike(value)
   return '<del>'.s:mid(a:value, 2).'</del>'
-endfunction "}}}
+endfunction
 
-function! s:tag_super(value) "{{{
+
+function! s:tag_super(value)
   return '<sup><small>'.s:mid(a:value, 1).'</small></sup>'
-endfunction "}}}
+endfunction
 
-function! s:tag_sub(value) "{{{
+
+function! s:tag_sub(value)
   return '<sub><small>'.s:mid(a:value, 2).'</small></sub>'
-endfunction "}}}
+endfunction
 
-function! s:tag_code(value) "{{{
+
+function! s:tag_code(value)
   return '<code>'.s:safe_html_preformatted(s:mid(a:value, 1)).'</code>'
-endfunction "}}}
-
-"function! s:tag_pre(value) "{{{
-"  return '<code>'.s:mid(a:value, 3).'</code>'
-"endfunction "}}}
-
-"FIXME dead code?
-"function! s:tag_math(value) "{{{
-"  return '\['.s:mid(a:value, 3).'\]'
-"endfunction "}}}
+endfunction
 
 
-"{{{ v2.0 links
-"   match n-th ARG within {{URL[|ARG1|ARG2|...]}} " {{{
+"   match n-th ARG within {{URL[|ARG1|ARG2|...]}}
 " *c,d,e),...
 function! vimwiki#html#incl_match_arg(nn_index)
   let rx = vimwiki#vars#get_global('rxWikiInclPrefix'). vimwiki#vars#get_global('rxWikiInclUrl')
-  let rx = rx. repeat(vimwiki#vars#get_global('rxWikiInclSeparator'). vimwiki#vars#get_global('rxWikiInclArg'), a:nn_index-1)
+  let rx = rx . repeat(vimwiki#vars#get_global('rxWikiInclSeparator') .
+        \ vimwiki#vars#get_global('rxWikiInclArg'), a:nn_index-1)
   if a:nn_index > 0
-    let rx = rx. vimwiki#vars#get_global('rxWikiInclSeparator'). '\zs'. vimwiki#vars#get_global('rxWikiInclArg'). '\ze'
+    let rx = rx. vimwiki#vars#get_global('rxWikiInclSeparator'). '\zs' .
+          \ vimwiki#vars#get_global('rxWikiInclArg') . '\ze'
   endif
-  let rx = rx. vimwiki#vars#get_global('rxWikiInclArgs'). vimwiki#vars#get_global('rxWikiInclSuffix')
+  let rx = rx . vimwiki#vars#get_global('rxWikiInclArgs') .
+        \ vimwiki#vars#get_global('rxWikiInclSuffix')
   return rx
 endfunction
-"}}}
 
-function! vimwiki#html#linkify_link(src, descr) "{{{
+
+function! vimwiki#html#linkify_link(src, descr)
   let src_str = ' href="'.s:escape_html_attribute(a:src).'"'
   let descr = substitute(a:descr,'^\s*\(.*\)\s*$','\1','')
   let descr = (descr == "" ? a:src : descr)
   let descr_str = (descr =~# vimwiki#vars#get_global('rxWikiIncl')
-        \ ? s:tag_wikiincl(descr) 
+        \ ? s:tag_wikiincl(descr)
         \ : descr)
   return '<a'.src_str.'>'.descr_str.'</a>'
-endfunction "}}}
+endfunction
 
-function! vimwiki#html#linkify_image(src, descr, verbatim_str) "{{{
+
+function! vimwiki#html#linkify_image(src, descr, verbatim_str)
   let src_str = ' src="'.a:src.'"'
   let descr_str = (a:descr != '' ? ' alt="'.a:descr.'"' : '')
   let verbatim_str = (a:verbatim_str != '' ? ' '.a:verbatim_str : '')
   return '<img'.src_str.descr_str.verbatim_str.' />'
-endfunction "}}}
+endfunction
 
-function! s:tag_weblink(value) "{{{
+
+function! s:tag_weblink(value)
   " Weblink Template -> <a href="url">descr</a>
   let str = a:value
   let url = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
   let descr = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWeblinkMatchDescr'))
   let line = vimwiki#html#linkify_link(url, descr)
   return line
-endfunction "}}}
+endfunction
 
-function! s:tag_wikiincl(value) "{{{
+
+function! s:tag_wikiincl(value)
   " {{imgurl|arg1|arg2}}    -> ???
   " {{imgurl}}                -> <img src="imgurl"/>
   " {{imgurl|descr|style="A"}} -> <img src="imgurl" alt="descr" style="A" />
@@ -409,8 +417,7 @@ function! s:tag_wikiincl(value) "{{{
     let link_infos = vimwiki#base#resolve_link(url_0)
 
     if link_infos.scheme =~# '\mlocal\|wiki\d\+\|diary'
-      let url = vimwiki#path#relpath(fnamemodify(s:current_html_file, ':h'),
-            \ link_infos.filename)
+      let url = vimwiki#path#relpath(fnamemodify(s:current_html_file, ':h'), link_infos.filename)
       " strip the .html extension when we have wiki links, so that the user can
       " simply write {{image.png}} to include an image from the wiki directory
       if link_infos.scheme =~# '\mwiki\d\+\|diary'
@@ -424,9 +431,10 @@ function! s:tag_wikiincl(value) "{{{
     let line = vimwiki#html#linkify_image(url, descr, verbatim_str)
   endif
   return line
-endfunction "}}}
+endfunction
 
-function! s:tag_wikilink(value) "{{{
+
+function! s:tag_wikilink(value)
   " [[url]]                   -> <a href="url.html">url</a>
   " [[url|descr]]             -> <a href="url.html">descr</a>
   " [[url|{{...}}]]           -> <a href="url.html"> ... </a>
@@ -439,8 +447,7 @@ function! s:tag_wikilink(value) "{{{
   let descr = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'))
   let descr = (substitute(descr,'^\s*\(.*\)\s*$','\1','') != '' ? descr : url)
 
-  let line = VimwikiLinkConverter(url, s:current_wiki_file,
-        \ s:current_html_file)
+  let line = VimwikiLinkConverter(url, s:current_wiki_file, s:current_html_file)
   if line == ''
     let link_infos = vimwiki#base#resolve_link(url, s:current_wiki_file)
 
@@ -471,11 +478,10 @@ function! s:tag_wikilink(value) "{{{
 
   let line = vimwiki#html#linkify_link(line, descr)
   return line
-endfunction "}}}
-"}}}
+endfunction
 
 
-function! s:tag_remove_internal_link(value) "{{{
+function! s:tag_remove_internal_link(value)
   let value = s:mid(a:value, 2)
 
   let line = ''
@@ -496,9 +502,10 @@ function! s:tag_remove_internal_link(value) "{{{
     let line = value
   endif
   return line
-endfunction "}}}
+endfunction
 
-function! s:tag_remove_external_link(value) "{{{
+
+function! s:tag_remove_external_link(value)
   let value = s:mid(a:value, 1)
 
   let line = ''
@@ -518,14 +525,16 @@ function! s:tag_remove_external_link(value) "{{{
     let line = '['.value.']'
   endif
   return line
-endfunction "}}}
+endfunction
 
-function! s:make_tag(line, regexp, func, ...) "{{{
+
+function! s:make_tag(line, regexp, func, ...)
   " Make tags for a given matched regexp.
   " Exclude preformatted text and href links.
-  " FIXME 
+  " FIXME
   let patt_splitter = '\(`[^`]\+`\)\|'.
-                    \ '\('.vimwiki#vars#get_syntaxlocal('rxPreStart').'.\+'.vimwiki#vars#get_syntaxlocal('rxPreEnd').'\)\|'.
+                    \ '\('.vimwiki#vars#get_syntaxlocal('rxPreStart').'.\+'.
+                    \ vimwiki#vars#get_syntaxlocal('rxPreEnd').'\)\|'.
                     \ '\(<a href.\{-}</a>\)\|'.
                     \ '\(<img src.\{-}/>\)\|'.
                     \ '\(<pre.\{-}</pre>\)\|'.
@@ -557,16 +566,18 @@ function! s:make_tag(line, regexp, func, ...) "{{{
     endfor
   endif
   return res_line
-endfunction "}}}
+endfunction
 
-function! s:process_tags_remove_links(line) " {{{
+
+function! s:process_tags_remove_links(line)
   let line = a:line
   let line = s:make_tag(line, '\[\[.\{-}\]\]', 's:tag_remove_internal_link')
   let line = s:make_tag(line, '\[.\{-}\]', 's:tag_remove_external_link')
   return line
-endfunction " }}}
+endfunction
 
-function! s:process_tags_typefaces(line, header_ids) "{{{
+
+function! s:process_tags_typefaces(line, header_ids)
   let line = a:line
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxItalic'), 's:tag_em')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxBold'), 's:tag_strong', a:header_ids)
@@ -578,71 +589,76 @@ function! s:process_tags_typefaces(line, header_ids) "{{{
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxEqIn'), 's:tag_eqin')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxTags'), 's:tag_tags', a:header_ids)
   return line
-endfunction " }}}
+endfunction
 
-function! s:process_tags_links(line) " {{{
+
+function! s:process_tags_links(line)
   let line = a:line
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxWikiLink'), 's:tag_wikilink')
   let line = s:make_tag(line, vimwiki#vars#get_global('rxWikiIncl'), 's:tag_wikiincl')
   let line = s:make_tag(line, vimwiki#vars#get_syntaxlocal('rxWeblink'), 's:tag_weblink')
   return line
-endfunction " }}}
+endfunction
 
-function! s:process_inline_tags(line, header_ids) "{{{
+
+function! s:process_inline_tags(line, header_ids)
   let line = s:process_tags_links(a:line)
   let line = s:process_tags_typefaces(line, a:header_ids)
   return line
-endfunction " }}}
-"}}}
+endfunction
 
-" BLOCK TAGS {{{
-function! s:close_tag_pre(pre, ldest) "{{{
+
+function! s:close_tag_pre(pre, ldest)
   if a:pre[0]
     call insert(a:ldest, "</pre>")
     return 0
   endif
   return a:pre
-endfunction "}}}
+endfunction
 
-function! s:close_tag_math(math, ldest) "{{{
+
+function! s:close_tag_math(math, ldest)
   if a:math[0]
     call insert(a:ldest, "\\\]")
     return 0
   endif
   return a:math
-endfunction "}}}
+endfunction
 
-function! s:close_tag_quote(quote, ldest) "{{{
+
+function! s:close_tag_quote(quote, ldest)
   if a:quote
     call insert(a:ldest, "</blockquote>")
     return 0
   endif
   return a:quote
-endfunction "}}}
+endfunction
 
-function! s:close_tag_para(para, ldest) "{{{
+
+function! s:close_tag_para(para, ldest)
   if a:para
     call insert(a:ldest, "</p>")
     return 0
   endif
   return a:para
-endfunction "}}}
+endfunction
 
-function! s:close_tag_table(table, ldest, header_ids) "{{{
+
+function! s:close_tag_table(table, ldest, header_ids)
   " The first element of table list is a string which tells us if table should be centered.
   " The rest elements are rows which are lists of columns:
-  " ['center', 
+  " ['center',
   "   [ CELL1, CELL2, CELL3 ],
   "   [ CELL1, CELL2, CELL3 ],
   "   [ CELL1, CELL2, CELL3 ],
   " ]
   " And CELLx is: { 'body': 'col_x', 'rowspan': r, 'colspan': c }
 
-  function! s:sum_rowspan(table) "{{{
+  function! s:sum_rowspan(table)
     let table = a:table
 
     " Get max cells
-    let max_cells = 0 
+    let max_cells = 0
     for row in table[1:]
       let n_cells = len(row)
       if n_cells > max_cells
@@ -668,9 +684,9 @@ function! s:close_tag_table(table, ldest, header_ids) "{{{
         endif
       endfor
     endfor
-  endfunction "}}}
+  endfunction
 
-  function! s:sum_colspan(table) "{{{
+  function! s:sum_colspan(table)
     for row in a:table[1:]
       let cols = 1
 
@@ -683,19 +699,19 @@ function! s:close_tag_table(table, ldest, header_ids) "{{{
         endif
       endfor
     endfor
-  endfunction "}}}
+  endfunction
 
-  function! s:close_tag_row(row, header, ldest, header_ids) "{{{
+  function! s:close_tag_row(row, header, ldest, header_ids)
     call add(a:ldest, '<tr>')
 
-    " Set tag element of columns 
+    " Set tag element of columns
     if a:header
       let tag_name = 'th'
     else
       let tag_name = 'td'
     end
 
-    " Close tag of columns 
+    " Close tag of columns
     for cell in a:row
       if cell.rowspan == 0 || cell.colspan == 0
         continue
@@ -718,7 +734,7 @@ function! s:close_tag_table(table, ldest, header_ids) "{{{
     endfor
 
     call add(a:ldest, '</tr>')
-  endfunction "}}}
+  endfunction
 
   let table = a:table
   let ldest = a:ldest
@@ -761,24 +777,27 @@ function! s:close_tag_table(table, ldest, header_ids) "{{{
     let table = []
   endif
   return table
-endfunction "}}}
+endfunction
 
-function! s:close_tag_list(lists, ldest) "{{{
+
+function! s:close_tag_list(lists, ldest)
   while len(a:lists)
     let item = remove(a:lists, 0)
     call insert(a:ldest, item[0])
   endwhile
-endfunction "}}}
+endfunction
 
-function! s:close_tag_def_list(deflist, ldest) "{{{
+
+function! s:close_tag_def_list(deflist, ldest)
   if a:deflist
     call insert(a:ldest, "</dl>")
     return 0
   endif
   return a:deflist
-endfunction "}}}
+endfunction
 
-function! s:process_tag_pre(line, pre) "{{{
+
+function! s:process_tag_pre(line, pre)
   " pre is the list of [is_in_pre, indent_of_pre]
   "XXX always outputs a single line or empty list!
   let lines = []
@@ -808,9 +827,10 @@ function! s:process_tag_pre(line, pre) "{{{
     call add(lines, s:safe_html_preformatted(a:line))
   endif
   return [processed, lines, pre]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_math(line, math) "{{{
+
+function! s:process_tag_math(line, math)
   " math is the list of [is_in_math, indent_of_math]
   let lines = []
   let math = a:math
@@ -844,9 +864,10 @@ function! s:process_tag_math(line, math) "{{{
     call add(lines, substitute(a:line, '^\s\{'.math[1].'}', '', ''))
   endif
   return [processed, lines, math]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_quote(line, quote) "{{{
+
+function! s:process_tag_quote(line, quote)
   let lines = []
   let quote = a:quote
   let processed = 0
@@ -862,11 +883,12 @@ function! s:process_tag_quote(line, quote) "{{{
     let quote = 0
   endif
   return [processed, lines, quote]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_list(line, lists) "{{{
 
-  function! s:add_checkbox(line, rx_list) "{{{
+function! s:process_tag_list(line, lists)
+
+  function! s:add_checkbox(line, rx_list)
     let st_tag = '<li>'
     let chk = matchlist(a:line, a:rx_list)
     if !empty(chk) && len(chk[1]) > 0
@@ -882,7 +904,8 @@ function! s:process_tag_list(line, lists) "{{{
       endif
     endif
     return [st_tag, '']
-  endfunction "}}}
+  endfunction
+
 
   let in_list = (len(a:lists) > 0)
 
@@ -946,8 +969,7 @@ function! s:process_tag_list(line, lists) "{{{
 
     call add(a:lists, [en_tag, indent])
     call add(lines, st_tag)
-    call add(lines,
-          \ substitute(a:line, lstRegExp.'\%('.checkbox.'\)\?', '', ''))
+    call add(lines, substitute(a:line, lstRegExp.'\%('.checkbox.'\)\?', '', ''))
     let processed = 1
   elseif in_list && a:line =~# '^\s\+\S\+'
     if vimwiki#vars#get_global('list_ignore_newline')
@@ -960,9 +982,10 @@ function! s:process_tag_list(line, lists) "{{{
     call s:close_tag_list(a:lists, lines)
   endif
   return [processed, lines]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_def_list(line, deflist) "{{{
+
+function! s:process_tag_def_list(line, deflist)
   let lines = []
   let deflist = a:deflist
   let processed = 0
@@ -984,9 +1007,10 @@ function! s:process_tag_def_list(line, deflist) "{{{
     call add(lines, "</dl>")
   endif
   return [processed, lines, deflist]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_para(line, para) "{{{
+
+function! s:process_tag_para(line, para)
   let lines = []
   let para = a:para
   let processed = 0
@@ -1006,9 +1030,10 @@ function! s:process_tag_para(line, para) "{{{
     let para = 0
   endif
   return [processed, lines, para]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_h(line, id) "{{{
+
+function! s:process_tag_h(line, id)
   let line = a:line
   let processed = 0
   let h_level = 0
@@ -1061,7 +1086,6 @@ function! s:process_tag_h(line, id) "{{{
 
     endif
 
-
     if centered
       let h_part .= ' class="justcenter">'
     else
@@ -1075,9 +1099,10 @@ function! s:process_tag_h(line, id) "{{{
     let processed = 1
   endif
   return [processed, line]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_hr(line) "{{{
+
+function! s:process_tag_hr(line)
   let line = a:line
   let processed = 0
   if a:line =~# '^-----*$'
@@ -1085,10 +1110,11 @@ function! s:process_tag_hr(line) "{{{
     let processed = 1
   endif
   return [processed, line]
-endfunction "}}}
+endfunction
 
-function! s:process_tag_table(line, table, header_ids) "{{{
-  function! s:table_empty_cell(value) "{{{
+
+function! s:process_tag_table(line, table, header_ids)
+  function! s:table_empty_cell(value)
     let cell = {}
 
     if a:value =~# '^\s*\\/\s*$'
@@ -1110,9 +1136,9 @@ function! s:process_tag_table(line, table, header_ids) "{{{
     endif
 
     return cell
-  endfunction "}}}
+  endfunction
 
-  function! s:table_add_row(table, line) "{{{
+  function! s:table_add_row(table, line)
     if empty(a:table)
       if a:line =~# '^\s\+'
         let row = ['center', []]
@@ -1123,7 +1149,7 @@ function! s:process_tag_table(line, table, header_ids) "{{{
       let row = [[]]
     endif
     return row
-  endfunction "}}}
+  endfunction
 
   let table = a:table
   let lines = []
@@ -1144,14 +1170,10 @@ function! s:process_tag_table(line, table, header_ids) "{{{
     let table = s:close_tag_table(table, lines, a:header_ids)
   endif
   return [processed, lines, table]
-endfunction "}}}
+endfunction
 
-"}}}
 
-" }}}
-
-" WIKI2HTML "{{{
-function! s:parse_line(line, state) " {{{
+function! s:parse_line(line, state)
   let state = {}
   let state.para = a:state.para
   let state.quote = a:state.quote
@@ -1169,7 +1191,7 @@ function! s:parse_line(line, state) " {{{
 
   let processed = 0
 
-  " pres "{{{
+  " pres
   if !processed
     let [processed, lines, state.pre] = s:process_tag_pre(line, state.pre)
     " pre is just fine to be in the list -- do not close list item here.
@@ -1193,7 +1215,7 @@ function! s:parse_line(line, state) " {{{
     endif
     call extend(res_lines, lines)
   endif
-  "}}}
+
 
   if !processed
     if line =~# vimwiki#vars#get_syntaxlocal('rxComment')
@@ -1227,7 +1249,7 @@ function! s:parse_line(line, state) " {{{
     endif
   endif
 
-  " html template -- placeholder "{{{
+  " html template -- placeholder
   if !processed
     if line =~# '\m^\s*%template\%(\s.*\)\?$'
       let processed = 1
@@ -1235,17 +1257,16 @@ function! s:parse_line(line, state) " {{{
       let state.placeholder = ['template', param]
     endif
   endif
-  "}}}
 
-  " tables "{{{
+
+  " tables
   if !processed
-    let [processed, lines, state.table] = s:process_tag_table(line,
-          \ state.table, state.header_ids)
+    let [processed, lines, state.table] = s:process_tag_table(line, state.table, state.header_ids)
     call extend(res_lines, lines)
   endif
-  "}}}
 
-  " lists "{{{
+
+  " lists
   if !processed
     let [processed, lines] = s:process_tag_list(line, state.lists)
     if processed && state.quote
@@ -1271,15 +1292,14 @@ function! s:parse_line(line, state) " {{{
 
     call extend(res_lines, lines)
   endif
-  "}}}
 
-  " headers "{{{
+
+  " headers
   if !processed
     let [processed, line] = s:process_tag_h(line, state.header_ids)
     if processed
       call s:close_tag_list(state.lists, res_lines)
-      let state.table = s:close_tag_table(state.table, res_lines,
-            \ state.header_ids)
+      let state.table = s:close_tag_table(state.table, res_lines, state.header_ids)
       let state.pre = s:close_tag_pre(state.pre, res_lines)
       let state.math = s:close_tag_math(state.math, res_lines)
       let state.quote = s:close_tag_quote(state.quote, res_lines)
@@ -1288,9 +1308,9 @@ function! s:parse_line(line, state) " {{{
       call add(res_lines, line)
     endif
   endif
-  "}}}
 
-  " quotes "{{{
+
+  " quotes
   if !processed
     let [processed, lines, state.quote] = s:process_tag_quote(line, state.quote)
     if processed && len(state.lists)
@@ -1316,23 +1336,22 @@ function! s:parse_line(line, state) " {{{
 
     call extend(res_lines, lines)
   endif
-  "}}}
 
-  " horizontal rules "{{{
+
+  " horizontal rules
   if !processed
     let [processed, line] = s:process_tag_hr(line)
     if processed
       call s:close_tag_list(state.lists, res_lines)
-      let state.table = s:close_tag_table(state.table, res_lines,
-            \ state.header_ids)
+      let state.table = s:close_tag_table(state.table, res_lines, state.header_ids)
       let state.pre = s:close_tag_pre(state.pre, res_lines)
       let state.math = s:close_tag_math(state.math, res_lines)
       call add(res_lines, line)
     endif
   endif
-  "}}}
 
-  " definition lists "{{{
+
+  " definition lists
   if !processed
     let [processed, lines, state.deflist] = s:process_tag_def_list(line, state.deflist)
 
@@ -1340,9 +1359,9 @@ function! s:parse_line(line, state) " {{{
 
     call extend(res_lines, lines)
   endif
-  "}}}
 
-  "" P "{{{
+
+  "" P
   if !processed
     let [processed, lines, state.para] = s:process_tag_para(line, state.para)
     if processed && len(state.lists)
@@ -1358,15 +1377,14 @@ function! s:parse_line(line, state) " {{{
       let state.math = s:close_tag_math(state.math, res_lines)
     endif
     if processed && len(state.table)
-      let state.table = s:close_tag_table(state.table, res_lines,
-            \ state.header_ids)
+      let state.table = s:close_tag_table(state.table, res_lines, state.header_ids)
     endif
 
     call map(lines, 's:process_inline_tags(v:val, state.header_ids)')
 
     call extend(res_lines, lines)
   endif
-  "}}}
+
 
   "" add the rest
   if !processed
@@ -1375,14 +1393,17 @@ function! s:parse_line(line, state) " {{{
 
   return [res_lines, state]
 
-endfunction " }}}
+endfunction
 
-function! s:use_custom_wiki2html() "{{{
+
+function! s:use_custom_wiki2html()
   let custom_wiki2html = vimwiki#vars#get_wikilocal('custom_wiki2html')
-  return !empty(custom_wiki2html) && (s:file_exists(custom_wiki2html) || s:binary_exists(custom_wiki2html))
-endfunction " }}}
+  return !empty(custom_wiki2html) &&
+        \ (s:file_exists(custom_wiki2html) || s:binary_exists(custom_wiki2html))
+endfunction
 
-function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
+
+function! vimwiki#html#CustomWiki2HTML(path, wikifile, force)
   call vimwiki#path#mkdir(a:path)
   echomsg system(vimwiki#vars#get_wikilocal('custom_wiki2html'). ' '.
       \ a:force. ' '.
@@ -1391,14 +1412,20 @@ function! vimwiki#html#CustomWiki2HTML(path, wikifile, force) "{{{
       \ shellescape(a:path). ' '.
       \ shellescape(a:wikifile). ' '.
       \ shellescape(s:default_CSS_full_name(a:path)). ' '.
-      \ (len(vimwiki#vars#get_wikilocal('template_path')) > 1 ? shellescape(expand(vimwiki#vars#get_wikilocal('template_path'))) : '-'). ' '.
-      \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ? vimwiki#vars#get_wikilocal('template_default') : '-'). ' '.
-      \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ? vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '.
-      \ (len(vimwiki#vars#get_bufferlocal('subdir')) > 0 ? shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir'))) : '-'). ' '.
-      \ (len(vimwiki#vars#get_wikilocal('custom_wiki2html_args')) > 0 ? vimwiki#vars#get_wikilocal('custom_wiki2html_args') : '-'))
-endfunction " }}}
+      \ (len(vimwiki#vars#get_wikilocal('template_path')) > 1 ?
+      \     shellescape(expand(vimwiki#vars#get_wikilocal('template_path'))) : '-'). ' '.
+      \ (len(vimwiki#vars#get_wikilocal('template_default')) > 0 ?
+      \     vimwiki#vars#get_wikilocal('template_default') : '-'). ' '.
+      \ (len(vimwiki#vars#get_wikilocal('template_ext')) > 0 ?
+      \     vimwiki#vars#get_wikilocal('template_ext') : '-'). ' '.
+      \ (len(vimwiki#vars#get_bufferlocal('subdir')) > 0 ?
+      \     shellescape(s:root_path(vimwiki#vars#get_bufferlocal('subdir'))) : '-'). ' '.
+      \ (len(vimwiki#vars#get_wikilocal('custom_wiki2html_args')) > 0 ?
+      \     vimwiki#vars#get_wikilocal('custom_wiki2html_args') : '-'))
+endfunction
 
-function! s:convert_file(path_html, wikifile) "{{{
+
+function! s:convert_file(path_html, wikifile)
   let done = 0
 
   let wikifile = fnamemodify(a:wikifile, ":p")
@@ -1450,14 +1477,13 @@ function! s:convert_file(path_html, wikifile) "{{{
     let s:gt_pattern = '>'
     if vimwiki#vars#get_global('valid_html_tags') != ''
       let tags = join(split(vimwiki#vars#get_global('valid_html_tags'), '\s*,\s*'), '\|')
-      let s:lt_pattern = '\c<\%(/\?\%('.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?>\)\@!' 
+      let s:lt_pattern = '\c<\%(/\?\%('.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?>\)\@!'
       let s:gt_pattern = '\c\%(</\?\%('.tags.'\)\%(\s\{-1}\S\{-}\)\{-}/\?\)\@<!>'
     endif
 
     " prepare regexps for lists
     let s:bullets = '[*-]'
-    let s:numbers =
-      \'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'
+    let s:numbers = '\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'
 
     for line in lsource
       let oldquote = state.quote
@@ -1539,17 +1565,19 @@ function! s:convert_file(path_html, wikifile) "{{{
   endif
 
   return path_html.htmlfile
-endfunction "}}}
+endfunction
 
-function! vimwiki#html#Wiki2HTML(path_html, wikifile) "{{{
+
+function! vimwiki#html#Wiki2HTML(path_html, wikifile)
   let result = s:convert_file(a:path_html, a:wikifile)
   if result != ''
     call s:create_default_CSS(a:path_html)
   endif
   return result
-endfunction "}}}
+endfunction
 
-function! vimwiki#html#WikiAll2HTML(path_html) "{{{
+
+function! vimwiki#html#WikiAll2HTML(path_html)
   if !s:syntax_supported() && !s:use_custom_wiki2html()
     echomsg 'Vimwiki Error: Conversion to HTML is not supported for this syntax'
     return
@@ -1577,7 +1605,8 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
   let current_subdir = vimwiki#vars#get_bufferlocal('subdir')
   let current_invsubdir = vimwiki#vars#get_bufferlocal('invsubdir')
 
-  let wikifiles = split(glob(vimwiki#vars#get_wikilocal('path').'**/*'.vimwiki#vars#get_wikilocal('ext')), '\n')
+  let wikifiles = split(glob(vimwiki#vars#get_wikilocal('path').'**/*'.
+        \ vimwiki#vars#get_wikilocal('ext')), '\n')
   for wikifile in wikifiles
     let wikifile = fnamemodify(wikifile, ":p")
 
@@ -1606,27 +1635,32 @@ function! vimwiki#html#WikiAll2HTML(path_html) "{{{
   echomsg 'Vimwiki: Done!'
 
   let &more = setting_more
-endfunction "}}}
+endfunction
 
-function! s:file_exists(fname) "{{{
+
+function! s:file_exists(fname)
   return !empty(getftype(expand(a:fname)))
-endfunction "}}}
+endfunction
 
-function! s:binary_exists(fname) "{{{
+
+function! s:binary_exists(fname)
   return executable(expand(a:fname))
-endfunction "}}}
+endfunction
 
-function! s:get_wikifile_url(wikifile) "{{{
+
+function! s:get_wikifile_url(wikifile)
   return vimwiki#vars#get_wikilocal('path_html') .
     \ vimwiki#base#subdir(vimwiki#vars#get_wikilocal('path'), a:wikifile).
     \ fnamemodify(a:wikifile, ":t:r").'.html'
-endfunction "}}}
+endfunction
 
-function! vimwiki#html#PasteUrl(wikifile) "{{{
+
+function! vimwiki#html#PasteUrl(wikifile)
   execute 'r !echo file://'.s:get_wikifile_url(a:wikifile)
-endfunction "}}}
+endfunction
 
-function! vimwiki#html#CatUrl(wikifile) "{{{
+
+function! vimwiki#html#CatUrl(wikifile)
   execute '!echo file://'.s:get_wikifile_url(a:wikifile)
-endfunction "}}}
-"}}}
+endfunction
+
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 390e542..d4ccbbd 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1,20 +1,25 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Everything concerning lists and checkboxes
+" Description: Everything concerning lists and checkboxes
 " Home: https://github.com/vimwiki/vimwiki/
 
+
 if exists("g:loaded_vimwiki_list_auto") || &cp
   finish
 endif
 let g:loaded_vimwiki_list_auto = 1
 
-"incrementation functions for the various kinds of numbers {{{
 
-function! s:increment_1(value) "{{{
+" ---------------------------------------------------------
+" incrementation functions for the various kinds of numbers
+" ---------------------------------------------------------
+
+function! s:increment_1(value)
   return eval(a:value) + 1
-endfunction "}}}
+endfunction
 
-function! s:increment_A(value) "{{{
+
+function! s:increment_A(value)
   let list_of_chars = split(a:value, '.\zs')
   let done = 0
   for idx in reverse(range(len(list_of_chars)))
@@ -31,9 +36,10 @@ function! s:increment_A(value) "{{{
     call insert(list_of_chars, 'A')
   endif
   return join(list_of_chars, '')
-endfunction "}}}
+endfunction
 
-function! s:increment_a(value) "{{{
+
+function! s:increment_a(value)
   let list_of_chars = split(a:value, '.\zs')
   let done = 0
   for idx in reverse(range(len(list_of_chars)))
@@ -50,9 +56,10 @@ function! s:increment_a(value) "{{{
     call insert(list_of_chars, 'a')
   endif
   return join(list_of_chars, '')
-endfunction "}}}
+endfunction
 
-function! s:increment_I(value) "{{{
+
+function! s:increment_I(value)
   let subst_list = [ ['XLVIII$', 'IL'], ['VIII$', 'IX'], ['III$', 'IV'],
         \ ['DCCCXCIX$', 'CM'], ['CCCXCIX$', 'CD'], ['LXXXIX$', 'XC'],
         \ ['XXXIX$', 'XL'], ['\(I\{1,2\}\)$', '\1I'], ['CDXCIX$', 'D'],
@@ -64,9 +71,10 @@ function! s:increment_I(value) "{{{
     endif
   endfor
   return ''
-endfunction "}}}
+endfunction
 
-function! s:increment_i(value) "{{{
+
+function! s:increment_i(value)
   let subst_list = [ ['xlviii$', 'il'], ['viii$', 'ix'], ['iii$', 'iv'],
         \ ['dcccxcix$', 'cm'], ['cccxcix$', 'cd'], ['lxxxix$', 'xc'],
         \ ['xxxix$', 'xl'], ['\(i\{1,2\}\)$', '\1i'], ['cdxcix$', 'd'],
@@ -78,27 +86,29 @@ function! s:increment_i(value) "{{{
     endif
   endfor
   return ''
-endfunction "}}}
+endfunction
 
-"incrementation functions for the various kinds of numbers }}}
 
-"utility functions {{{
+" ---------------------------------------------------------
+" utility functions
+" ---------------------------------------------------------
 
-function! s:substitute_rx_in_line(lnum, pattern, new_string) "{{{
-  call setline(a:lnum, substitute(getline(a:lnum), a:pattern, a:new_string,
-        \ ''))
-endfunction "}}}
+function! s:substitute_rx_in_line(lnum, pattern, new_string)
+  call setline(a:lnum, substitute(getline(a:lnum), a:pattern, a:new_string, ''))
+endfunction
 
-function! s:substitute_string_in_line(lnum, old_string, new_string) "{{{
-  call s:substitute_rx_in_line(a:lnum, vimwiki#u#escape(a:old_string),
-        \ a:new_string)
-endfunction "}}}
 
-function! s:first_char(string) "{{{
+function! s:substitute_string_in_line(lnum, old_string, new_string)
+  call s:substitute_rx_in_line(a:lnum, vimwiki#u#escape(a:old_string), a:new_string)
+endfunction
+
+
+function! s:first_char(string)
   return matchstr(a:string, '^.')
-endfunction "}}}
+endfunction
 
-if exists("*strdisplaywidth") "{{{
+
+if exists("*strdisplaywidth")
   function! s:string_length(str)
     return strdisplaywidth(a:str)
   endfunction
@@ -106,31 +116,35 @@ else
   function! s:string_length(str)
     return strlen(substitute(a:str, '.', 'x', 'g'))
   endfunction
-endif "}}}
+endif
 
-function! vimwiki#lst#default_symbol() "{{{
+
+function! vimwiki#lst#default_symbol()
   return vimwiki#vars#get_syntaxlocal('list_markers')[0]
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#get_list_margin() "{{{
+
+function! vimwiki#lst#get_list_margin()
   let list_margin = vimwiki#vars#get_wikilocal('list_margin')
   if list_margin < 0
     return &sw
   else
     return list_margin
   endif
-endfunction "}}}
+endfunction
+
 
 "Returns: the column where the text of a line starts (possible list item
 "markers and checkboxes are skipped)
-function! s:text_begin(lnum) "{{{
+function! s:text_begin(lnum)
   return s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal('rxListItem')))
-endfunction "}}}
+endfunction
+
 
 "Returns: 2 if there is a marker and text
 " 1 for a marker and no text
 " 0 for no marker at all (empty line or only text)
-function! s:line_has_marker(lnum) "{{{
+function! s:line_has_marker(lnum)
   if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*$'
     return 1
   elseif getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxListItem').'\s*\S'
@@ -138,11 +152,12 @@ function! s:line_has_marker(lnum) "{{{
   else
     return 0
   endif
-endfunction "}}}
+endfunction
 
-"utility functions }}}
 
-"get properties of an item {{{
+" ---------------------------------------------------------
+" get properties of a list item
+" ---------------------------------------------------------
 
 "Returns: the mainly used data structure in this file
 "An item represents a single list item and is a dictionary with the keys
@@ -150,7 +165,7 @@ endfunction "}}}
 "type - 1 for bulleted item, 2 for numbered item, 0 for a regular line
 "mrkr - the concrete marker, e.g. '**' or 'b)'
 "cb   - the char in the checkbox or '' if there is no checkbox
-function! s:get_item(lnum) "{{{
+function! s:get_item(lnum)
   let item = {'lnum': a:lnum}
   if a:lnum == 0 || a:lnum > line('$')
     let item.type = 0
@@ -176,33 +191,37 @@ function! s:get_item(lnum) "{{{
   endif
 
   return item
-endfunction "}}}
+endfunction
 
-function! s:empty_item() "{{{
+
+function! s:empty_item()
   return {'type': 0}
-endfunction "}}}
+endfunction
+
 
 "Returns: level of the line
 "0 is the 'highest' level
-function! s:get_level(lnum) "{{{
+function! s:get_level(lnum)
   if getline(a:lnum) =~# '^\s*$'
     return 0
   endif
   if !vimwiki#vars#get_syntaxlocal('recurring_bullets')
     let level = indent(a:lnum)
   else
-    let level = s:string_length(matchstr(getline(a:lnum), vimwiki#vars#get_syntaxlocal(rx_bullet_chars)))-1
+    let level = s:string_length(matchstr(getline(a:lnum),
+          \ vimwiki#vars#get_syntaxlocal(rx_bullet_chars)))-1
     if level < 0
       let level = (indent(a:lnum) == 0) ? 0 : 9999
     endif
   endif
   return level
-endfunction "}}}
+endfunction
+
 
 "Returns: 1, a, i, A, I or ''
 "If in doubt if alphanumeric character or romanian
 "numeral, peek in the previous line
-function! s:guess_kind_of_numbered_item(item) "{{{
+function! s:guess_kind_of_numbered_item(item)
   if a:item.type != 2 | return '' | endif
   let number_chars = a:item.mrkr[:-2]
   let divisor = a:item.mrkr[-1:]
@@ -260,9 +279,10 @@ function! s:guess_kind_of_numbered_item(item) "{{{
 
     endif
   endif
-endfunction "}}}
+endfunction
 
-function! s:regexp_of_marker(item) "{{{
+
+function! s:regexp_of_marker(item)
   if a:item.type == 1
     return vimwiki#u#escape(a:item.mrkr)
   elseif a:item.type == 2
@@ -276,15 +296,16 @@ function! s:regexp_of_marker(item) "{{{
   else
     return ''
   endif
-endfunction "}}}
+endfunction
 
-"get properties of an item }}}
 
-"functions for navigating between items {{{
+" ---------------------------------------------------------
+" functions for navigating between items
+" ---------------------------------------------------------
 
 "Returns: the list item after a:item or an empty item
 "If a:ignore_kind is 1, the markers can differ
-function! s:get_next_list_item(item, ignore_kind) "{{{
+function! s:get_next_list_item(item, ignore_kind)
   let org_lvl = s:get_level(a:item.lnum)
   if !a:ignore_kind
     let org_regex = s:regexp_of_marker(a:item)
@@ -303,11 +324,12 @@ function! s:get_next_list_item(item, ignore_kind) "{{{
     let cur_ln = s:get_next_line(cur_ln)
   endwhile
   return s:empty_item()
-endfunction "}}}
+endfunction
+
 
 "Returns: the list item before a:item or an empty item
 "If a:ignore_kind is 1, the markers can differ
-function! s:get_prev_list_item(item, ignore_kind) "{{{
+function! s:get_prev_list_item(item, ignore_kind)
   let org_lvl = s:get_level(a:item.lnum)
   if !a:ignore_kind
     let org_regex = s:regexp_of_marker(a:item)
@@ -326,9 +348,10 @@ function! s:get_prev_list_item(item, ignore_kind) "{{{
     let cur_ln = s:get_prev_line(cur_ln)
   endwhile
   return s:empty_item()
-endfunction "}}}
+endfunction
 
-function! s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex) "{{{
+
+function! s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex)
   let cur_linecontent = getline(a:cur_ln)
   if a:cur_lvl == a:org_lvl
     if cur_linecontent =~# '^\s*'.a:org_regex.'\s'
@@ -339,17 +362,19 @@ function! s:get_item_of_level(cur_ln, cur_lvl, org_lvl, org_regex) "{{{
   elseif a:cur_lvl < a:org_lvl
     return s:empty_item()
   endif
-endfunction "}}}
+endfunction
 
-function! s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl) "{{{
+
+function! s:get_any_item_of_level(cur_ln, cur_lvl, org_lvl)
   if a:cur_lvl == a:org_lvl
     return s:get_item(a:cur_ln)
   elseif a:cur_lvl < a:org_lvl
     return s:empty_item()
   endif
-endfunction "}}}
+endfunction
 
-function! s:get_first_item_in_list(item, ignore_kind) "{{{
+
+function! s:get_first_item_in_list(item, ignore_kind)
   let cur_item = a:item
   while 1
     let prev_item = s:get_prev_list_item(cur_item, a:ignore_kind)
@@ -360,9 +385,10 @@ function! s:get_first_item_in_list(item, ignore_kind) "{{{
     endif
   endwhile
   return cur_item
-endfunction "}}}
+endfunction
 
-function! s:get_last_item_in_list(item, ignore_kind) "{{{
+
+function! s:get_last_item_in_list(item, ignore_kind)
   let cur_item = a:item
   while 1
     let next_item = s:get_next_list_item(cur_item, a:ignore_kind)
@@ -373,17 +399,17 @@ function! s:get_last_item_in_list(item, ignore_kind) "{{{
     endif
   endwhile
   return cur_item
-endfunction "}}}
+endfunction
+
 
 "Returns: lnum+1 in most cases, but skips blank lines and preformatted text,
 "0 in case of nonvalid line.
 "If there is no second argument, 0 is returned at a header, otherwise the
 "header is skipped
-function! s:get_next_line(lnum, ...) "{{{
+function! s:get_next_line(lnum, ...)
   if getline(a:lnum) =~# vimwiki#vars#get_syntaxlocal('rxPreStart')
     let cur_ln = a:lnum + 1
-    while cur_ln <= line('$') &&
-          \ getline(cur_ln) !~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
+    while cur_ln <= line('$') && getline(cur_ln) !~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
       let cur_ln += 1
     endwhile
     let next_line = cur_ln
@@ -401,11 +427,12 @@ function! s:get_next_line(lnum, ...) "{{{
   endif
 
   return next_line
-endfunction "}}}
+endfunction
+
 
 "Returns: lnum-1 in most cases, but skips blank lines and preformatted text
 "0 in case of nonvalid line and a header, because a header ends every list
-function! s:get_prev_line(lnum) "{{{
+function! s:get_prev_line(lnum)
   let prev_line = prevnonblank(a:lnum-1)
 
   if getline(prev_line) =~# vimwiki#vars#get_syntaxlocal('rxPreEnd')
@@ -425,9 +452,10 @@ function! s:get_prev_line(lnum) "{{{
   endif
 
   return prev_line
-endfunction "}}}
+endfunction
 
-function! s:get_first_child(item) "{{{
+
+function! s:get_first_child(item)
   if a:item.lnum >= line('$')
     return s:empty_item()
   endif
@@ -437,19 +465,18 @@ function! s:get_first_child(item) "{{{
     if cur_item.type != 0 && s:get_level(cur_item.lnum) > org_lvl
       return cur_item
     endif
-    if cur_item.lnum > line('$') || cur_item.lnum <= 0 ||
-          \ s:get_level(cur_item.lnum) <= org_lvl
+    if cur_item.lnum > line('$') || cur_item.lnum <= 0 || s:get_level(cur_item.lnum) <= org_lvl
       return s:empty_item()
     endif
     let cur_item = s:get_item(s:get_next_line(cur_item.lnum))
   endwhile
-endfunction "}}}
+endfunction
 
 
 "Returns: the next sibling of a:child, given the parent item
 "Used for iterating over children
 "Note: child items do not necessarily have the same indent, i.e. level
-function! s:get_next_child_item(parent, child) "{{{
+function! s:get_next_child_item(parent, child)
   if a:parent.type == 0 | return s:empty_item() | endif
   let parent_lvl = s:get_level(a:parent.lnum)
   let cur_ln = s:get_last_line_of_item_incl_children(a:child)
@@ -465,9 +492,10 @@ function! s:get_next_child_item(parent, child) "{{{
     endif
   endwhile
   return s:empty_item()
-endfunction "}}}
+endfunction
 
-function! s:get_parent(item) "{{{
+
+function! s:get_parent(item)
   let parent_line = 0
 
   let cur_ln = prevnonblank(a:item.lnum)
@@ -491,10 +519,11 @@ function! s:get_parent(item) "{{{
     endif
   endwhile
   return s:get_item(parent_line)
-endfunction "}}}
+endfunction
+
 
 "Returns: the item above or the item below or an empty item
-function! s:get_a_neighbor_item(item) "{{{
+function! s:get_a_neighbor_item(item)
   let prev_item = s:get_prev_list_item(a:item, 1)
   if prev_item.type != 0
     return prev_item
@@ -505,9 +534,10 @@ function! s:get_a_neighbor_item(item) "{{{
     endif
   endif
   return s:empty_item()
-endfunction "}}}
+endfunction
 
-function! s:get_a_neighbor_item_in_column(lnum, column) "{{{
+
+function! s:get_a_neighbor_item_in_column(lnum, column)
   let cur_ln = s:get_prev_line(a:lnum)
   while cur_ln >= 1
     if s:get_level(cur_ln) <= a:column
@@ -516,11 +546,12 @@ function! s:get_a_neighbor_item_in_column(lnum, column) "{{{
     let cur_ln = s:get_prev_line(cur_ln)
   endwhile
   return s:empty_item()
-endfunction "}}}
+endfunction
+
 
 "Returns: the item if there is one in a:lnum
 "else the multiline item a:lnum belongs to
-function! s:get_corresponding_item(lnum) "{{{
+function! s:get_corresponding_item(lnum)
   let item = s:get_item(a:lnum)
   if item.type != 0
     return item
@@ -539,10 +570,11 @@ function! s:get_corresponding_item(lnum) "{{{
     let cur_ln = s:get_prev_line(cur_ln)
   endwhile
   return s:empty_item()
-endfunction "}}}
+endfunction
+
 
 "Returns: the last line of a (possibly multiline) item, including all children
-function! s:get_last_line_of_item_incl_children(item) "{{{
+function! s:get_last_line_of_item_incl_children(item)
   let cur_ln = a:item.lnum
   let org_lvl = s:get_level(a:item.lnum)
   while 1
@@ -552,11 +584,12 @@ function! s:get_last_line_of_item_incl_children(item) "{{{
     endif
     let cur_ln = next_line
   endwhile
-endfunction "}}}
+endfunction
+
 
 "Returns: the last line of a (possibly multiline) item
 "Note: there can be other list items between the first and last line
-function! s:get_last_line_of_item(item) "{{{
+function! s:get_last_line_of_item(item)
   if a:item.type == 0 | return 0 | endif
   let org_lvl = s:get_level(a:item.lnum)
   let last_corresponding_line = a:item.lnum
@@ -571,20 +604,21 @@ function! s:get_last_line_of_item(item) "{{{
       let last_corresponding_line = cur_ln
       let cur_ln = s:get_next_line(cur_ln)
     else
-      let cur_ln = s:get_next_line(
-            \ s:get_last_line_of_item_incl_children(cur_item))
+      let cur_ln = s:get_next_line(s:get_last_line_of_item_incl_children(cur_item))
     endif
   endwhile
 
   return last_corresponding_line
-endfunction "}}}
+endfunction
 
-"functions for navigating between items }}}
 
-"renumber list items {{{
+" ---------------------------------------------------------
+" renumber list items
+" ---------------------------------------------------------
+
 "Renumbers the current list from a:item on downwards
 "Returns: the last item that was adjusted
-function! s:adjust_numbered_list_below(item, recursive) "{{{
+function! s:adjust_numbered_list_below(item, recursive)
   if !(a:item.type == 2 || (a:item.type == 1 && a:recursive))
     return a:item
   endif
@@ -611,9 +645,10 @@ function! s:adjust_numbered_list_below(item, recursive) "{{{
     let cur_item = next_item
   endwhile
   return cur_item
-endfunction "}}}
+endfunction
 
-function! s:adjust_items_recursively(parent) "{{{
+
+function! s:adjust_items_recursively(parent)
   if a:parent.type == 0
     return s:empty_item()
   end
@@ -630,13 +665,14 @@ function! s:adjust_items_recursively(parent) "{{{
       return last_item
     endif
   endwhile
-endfunction "}}}
+endfunction
+
 
 "Renumbers the list a:item is in.
 "If a:ignore_kind == 0, only the items which have the same kind of marker as
 "a:item are considered, otherwise all items.
 "Returns: the last item that was adjusted
-function! s:adjust_numbered_list(item, ignore_kind, recursive) "{{{
+function! s:adjust_numbered_list(item, ignore_kind, recursive)
   if !(a:item.type == 2 || (a:item.type == 1 && (a:ignore_kind || a:recursive)))
     return s:empty_item()
   end
@@ -645,10 +681,8 @@ function! s:adjust_numbered_list(item, ignore_kind, recursive) "{{{
 
   while 1
     if first_item.type == 2
-      let new_mrkr = s:guess_kind_of_numbered_item(first_item) .
-            \ first_item.mrkr[-1:]
-      call s:substitute_string_in_line(first_item.lnum, first_item.mrkr,
-            \ new_mrkr)
+      let new_mrkr = s:guess_kind_of_numbered_item(first_item) . first_item.mrkr[-1:]
+      call s:substitute_string_in_line(first_item.lnum, first_item.mrkr, new_mrkr)
       let first_item.mrkr = new_mrkr
     endif
 
@@ -660,20 +694,22 @@ function! s:adjust_numbered_list(item, ignore_kind, recursive) "{{{
     endif
     let first_item = next_first_item
   endwhile
-endfunction "}}}
+endfunction
+
 
 "Renumbers the list the cursor is in
 "also update its parents checkbox state
-function! vimwiki#lst#adjust_numbered_list() "{{{
+function! vimwiki#lst#adjust_numbered_list()
   let cur_item = s:get_corresponding_item(line('.'))
   if cur_item.type == 0 | return | endif
   call s:adjust_numbered_list(cur_item, 1, 0)
   call s:update_state(s:get_parent(cur_item))
-endfunction "}}}
+endfunction
+
 
 "Renumbers all lists of the buffer
 "of course, this might take some seconds
-function! vimwiki#lst#adjust_whole_buffer() "{{{
+function! vimwiki#lst#adjust_whole_buffer()
   let cur_ln = 1
   while 1
     let cur_item = s:get_item(cur_ln)
@@ -685,14 +721,15 @@ function! vimwiki#lst#adjust_whole_buffer() "{{{
       return
     endif
   endwhile
-endfunction "}}}
+endfunction
 
-"renumber list items }}}
 
-"checkbox stuff {{{
+" ---------------------------------------------------------
+" checkbox stuff
+" ---------------------------------------------------------
 
 "Returns: the rate of checkboxed list item in percent
-function! s:get_rate(item) "{{{
+function! s:get_rate(item)
   if a:item.type == 0 || a:item.cb == ''
     return -1
   endif
@@ -702,11 +739,12 @@ function! s:get_rate(item) "{{{
   endif
   let n = len(vimwiki#vars#get_syntaxlocal('listsyms_list'))
   return index(vimwiki#vars#get_syntaxlocal('listsyms_list'), state) * 100/(n-1)
-endfunction "}}}
+endfunction
+
 
 "Set state of the list item to [ ] or [o] or whatever
 "Returns: 1 if the state changed, 0 otherwise
-function! s:set_state(item, new_rate) "{{{
+function! s:set_state(item, new_rate)
   let new_state = s:rate_to_state(a:new_rate)
   let old_state = s:rate_to_state(s:get_rate(a:item))
   if new_state !=# old_state
@@ -715,11 +753,12 @@ function! s:set_state(item, new_rate) "{{{
   else
     return 0
   endif
-endfunction "}}}
+endfunction
+
 
 "Set state of the list item to [ ] or [o] or whatever
 "Updates the states of its child items
-function! s:set_state_plus_children(item, new_rate) "{{{
+function! s:set_state_plus_children(item, new_rate)
   call s:set_state(a:item, a:new_rate)
 
   let child_item = s:get_first_child(a:item)
@@ -732,10 +771,11 @@ function! s:set_state_plus_children(item, new_rate) "{{{
     endif
     let child_item = s:get_next_child_item(a:item, child_item)
   endwhile
-endfunction "}}}
+endfunction
+
 
 "Returns: the appropriate symbol for a given percent rate
-function! s:rate_to_state(rate) "{{{
+function! s:rate_to_state(rate)
   let listsyms_list = vimwiki#vars#get_syntaxlocal('listsyms_list')
   let state = ''
   let n = len(listsyms_list)
@@ -750,11 +790,12 @@ function! s:rate_to_state(rate) "{{{
     let state = listsyms_list[index]
   endif
   return state
-endfunction "}}}
+endfunction
+
 
 "updates the symbol of a checkboxed item according to the symbols of its
 "children
-function! s:update_state(item) "{{{
+function! s:update_state(item)
   if a:item.type == 0 || a:item.cb == ''
     return
   endif
@@ -787,18 +828,20 @@ function! s:update_state(item) "{{{
       call s:set_state_recursively(a:item, 0)
     endif
   endif
-endfunction "}}}
+endfunction
 
-function! s:set_state_recursively(item, new_rate) "{{{
+
+function! s:set_state_recursively(item, new_rate)
   let state_changed = s:set_state(a:item, a:new_rate)
   if state_changed
     call s:update_state(s:get_parent(a:item))
   endif
-endfunction "}}}
+endfunction
+
 
 "Creates checkbox in a list item.
 "Returns: 1 if successful
-function! s:create_cb(item) "{{{
+function! s:create_cb(item)
   if a:item.type == 0 || a:item.cb != ''
     return 0
   endif
@@ -810,20 +853,22 @@ function! s:create_cb(item) "{{{
 
   call s:update_state(new_item)
   return 1
-endfunction "}}}
+endfunction
 
-function! s:remove_cb(item) "{{{
+
+function! s:remove_cb(item)
   let item = a:item
   if item.type != 0 && item.cb != ''
     let item.cb = ''
     call s:substitute_rx_in_line(item.lnum, '\s\+\[.\]', '')
   endif
   return item
-endfunction "}}}
+endfunction
+
 
 "Change state of checkbox
 "in the lines of the given range
-function! s:change_cb(from_line, to_line, new_rate) "{{{
+function! s:change_cb(from_line, to_line, new_rate)
   let from_item = s:get_corresponding_item(a:from_line)
   if from_item.type == 0
     return
@@ -846,11 +891,12 @@ function! s:change_cb(from_line, to_line, new_rate) "{{{
     call s:update_state(parent_item)
   endfor
 
-endfunction "}}}
+endfunction
+
 
 "Toggles checkbox between two states in the lines of the given range,
 "creates chceckboxes if there aren't any.
-function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{
+function! s:toggle_create_cb(from_line, to_line, state1, state2)
   let from_item = s:get_corresponding_item(a:from_line)
   if from_item.type == 0
     return
@@ -886,11 +932,12 @@ function! s:toggle_create_cb(from_line, to_line, state1, state2) "{{{
 
   endif
 
-endfunction "}}}
+endfunction
+
 
 "Decrement checkbox between [ ] and [X]
 "in the lines of the given range
-function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
+function! vimwiki#lst#decrement_cb(from_line, to_line)
   let from_item = s:get_corresponding_item(a:from_line)
   if from_item.type == 0
     return
@@ -903,11 +950,12 @@ function! vimwiki#lst#decrement_cb(from_line, to_line) "{{{
 
   call s:change_cb(a:from_line, a:to_line, new_rate)
 
-endfunction "}}}
+endfunction
+
 
 "Increment checkbox between [ ] and [X]
 "in the lines of the given range
-function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
+function! vimwiki#lst#increment_cb(from_line, to_line)
   let from_item = s:get_corresponding_item(a:from_line)
   if from_item.type == 0
     return
@@ -920,23 +968,26 @@ function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
 
   call s:change_cb(a:from_line, a:to_line, new_rate)
 
-endfunction "}}}
+endfunction
+
 
 "Toggles checkbox between [ ] and [X] or creates one
 "in the lines of the given range
-function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
+function! vimwiki#lst#toggle_cb(from_line, to_line)
   return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
-endfunction "}}}
+endfunction
+
 
 "Toggles checkbox between [ ] and [-] or creates one
 "in the lines of the given range
-function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
+function! vimwiki#lst#toggle_rejected_cb(from_line, to_line)
   return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
-endfunction "}}}
+endfunction
+
 
 "Increment checkbox between [ ] and [X]
 "in the lines of the given range
-function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
+function! vimwiki#lst#increment_cb(from_line, to_line)
   let from_item = s:get_corresponding_item(a:from_line)
   if from_item.type == 0
     return
@@ -949,21 +1000,24 @@ function! vimwiki#lst#increment_cb(from_line, to_line) "{{{
 
   call s:change_cb(a:from_line, a:to_line, new_rate)
 
-endfunction "}}}
+endfunction
+
 
 "Toggles checkbox between [ ] and [X] or creates one
 "in the lines of the given range
-function! vimwiki#lst#toggle_cb(from_line, to_line) "{{{
+function! vimwiki#lst#toggle_cb(from_line, to_line)
   return s:toggle_create_cb(a:from_line, a:to_line, 100, 0)
-endfunction "}}}
+endfunction
+
 
 "Toggles checkbox between [ ] and [-] or creates one
 "in the lines of the given range
-function! vimwiki#lst#toggle_rejected_cb(from_line, to_line) "{{{
+function! vimwiki#lst#toggle_rejected_cb(from_line, to_line)
   return s:toggle_create_cb(a:from_line, a:to_line, -1, 0)
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
+
+function! vimwiki#lst#remove_cb(first_line, last_line)
   let first_item = s:get_corresponding_item(a:first_line)
   let last_item = s:get_corresponding_item(a:last_line)
 
@@ -988,11 +1042,11 @@ function! vimwiki#lst#remove_cb(first_line, last_line) "{{{
   for parent_item in parent_items_of_lines
     call s:update_state(parent_item)
   endfor
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#remove_cb_in_list() "{{{
-  let first_item = s:get_first_item_in_list(
-        \ s:get_corresponding_item(line('.')), 0)
+
+function! vimwiki#lst#remove_cb_in_list()
+  let first_item = s:get_first_item_in_list(s:get_corresponding_item(line('.')), 0)
 
   let cur_item = first_item
   while 1
@@ -1006,29 +1060,31 @@ function! vimwiki#lst#remove_cb_in_list() "{{{
   endwhile
 
   call s:update_state(s:get_parent(first_item))
-endfunction "}}}
+endfunction
 
-"checkbox stuff }}}
 
-"change the level of list items {{{
 
-function! s:set_indent(lnum, new_indent) "{{{
+" ---------------------------------------------------------
+" change the level of list items
+" ---------------------------------------------------------
+
+function! s:set_indent(lnum, new_indent)
   if &expandtab
     let indentstring = repeat(' ', a:new_indent)
   else
-    let indentstring = repeat('\t', a:new_indent / &tabstop) .
-          \ repeat(' ', a:new_indent % &tabstop)
+    let indentstring = repeat('\t', a:new_indent / &tabstop) . repeat(' ', a:new_indent % &tabstop)
   endif
   call s:substitute_rx_in_line(a:lnum, '^\s*', indentstring)
-endfunction "}}}
+endfunction
 
-function! s:decrease_level(item) "{{{
+
+function! s:decrease_level(item)
   let removed_indent = 0
   if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'),
+        \ s:first_char(a:item.mrkr)) > -1
     if s:string_length(a:item.mrkr) >= 2
-      call s:substitute_string_in_line(a:item.lnum,
-            \ s:first_char(a:item.mrkr), '')
+      call s:substitute_string_in_line(a:item.lnum, s:first_char(a:item.mrkr), '')
       let removed_indent = -1
     endif
   else
@@ -1042,12 +1098,14 @@ function! s:decrease_level(item) "{{{
     let removed_indent = new_indent - old_indent
   endif
   return removed_indent
-endfunction "}}}
+endfunction
 
-function! s:increase_level(item) "{{{
+
+function! s:increase_level(item)
   let additional_indent = 0
   if vimwiki#vars#get_syntaxlocal('recurring_bullets') && a:item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'),
+        \ s:first_char(a:item.mrkr)) > -1
     call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:item.mrkr .
           \ s:first_char(a:item.mrkr))
     let additional_indent = 1
@@ -1062,31 +1120,32 @@ function! s:increase_level(item) "{{{
     let additional_indent = new_indent - old_indent
   endif
   return additional_indent
-endfunction "}}}
+endfunction
+
 
 "adds a:indent_by to the current indent
 "a:indent_by can be negative
-function! s:indent_line_by(lnum, indent_by) "{{{
+function! s:indent_line_by(lnum, indent_by)
   let item = s:get_item(a:lnum)
   if vimwiki#vars#get_syntaxlocal('recurring_bullets') && item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(item.mrkr)) > -1
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'),
+        \ s:first_char(item.mrkr)) > -1
     if a:indent_by > 0
-      call s:substitute_string_in_line(a:lnum, item.mrkr,
-            \ item.mrkr . s:first_char(item.mrkr))
+      call s:substitute_string_in_line(a:lnum, item.mrkr, item.mrkr . s:first_char(item.mrkr))
     elseif a:indent_by < 0
       call s:substitute_string_in_line(a:lnum, s:first_char(item.mrkr), '')
     endif
   else
     call s:set_indent(a:lnum, indent(a:lnum) + a:indent_by)
   endif
-endfunction "}}}
+endfunction
+
 
 "changes lvl of lines in selection
-function! s:change_level(from_line, to_line, direction, plus_children) "{{{
+function! s:change_level(from_line, to_line, direction, plus_children)
   let from_item = s:get_corresponding_item(a:from_line)
   if from_item.type == 0
-    if a:direction ==# 'increase' && a:from_line == a:to_line &&
-          \ empty(getline(a:from_line))
+    if a:direction ==# 'increase' && a:from_line == a:to_line && empty(getline(a:from_line))
       "that's because :> doesn't work on an empty line
       normal! gi
     else
@@ -1127,8 +1186,7 @@ function! s:change_level(from_line, to_line, direction, plus_children) "{{{
   let first_line_level = s:get_level(from_item.lnum)
   let more_than_one_level_concerned = 0
 
-  let first_line_indented_by =
-        \ (a:direction ==# 'increase') ?
+  let first_line_indented_by = (a:direction ==# 'increase') ?
         \ s:increase_level(from_item) : s:decrease_level(from_item)
 
   let cur_ln = s:get_next_line(from_item.lnum)
@@ -1158,36 +1216,41 @@ function! s:change_level(from_line, to_line, direction, plus_children) "{{{
     call s:adjust_numbered_list(from_item, 0, 0)
     call s:adjust_numbered_list(to_be_adjusted, 0, 0)
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#change_level(from_line, to_line, direction, plus_children) "{{{
+
+function! vimwiki#lst#change_level(from_line, to_line, direction, plus_children)
   let cur_col = col('$') - col('.')
   call s:change_level(a:from_line, a:to_line, a:direction, a:plus_children)
   call cursor('.', col('$') - cur_col)
-endfunction "}}}
+endfunction
+
 
 "indent line a:lnum to be the continuation of a:prev_item
-function! s:indent_multiline(prev_item, lnum) "{{{
+function! s:indent_multiline(prev_item, lnum)
   if a:prev_item.type != 0
     call s:set_indent(a:lnum, s:text_begin(a:prev_item.lnum))
   endif
-endfunction "}}}
+endfunction
 
-"change the level of list items }}}
 
-"change markers of list items {{{
+" ---------------------------------------------------------
+" change markers of list items
+" ---------------------------------------------------------
+
 "Returns: the position of a marker in g:vimwiki_list_markers
-function! s:get_idx_list_markers(item) "{{{
+function! s:get_idx_list_markers(item)
   if a:item.type == 1
     let m = s:first_char(a:item.mrkr)
   else
     let m = s:guess_kind_of_numbered_item(a:item) . a:item.mrkr[-1:]
   endif
   return index(vimwiki#vars#get_syntaxlocal('list_markers'), m)
-endfunction "}}}
+endfunction
+
 
 "changes the marker of the given item to the next in g:vimwiki_list_markers
-function! s:get_next_mrkr(item) "{{{
+function! s:get_next_mrkr(item)
   let markers = vimwiki#vars#get_syntaxlocal('list_markers')
   if a:item.type == 0
     let new_mrkr = markers[0]
@@ -1196,10 +1259,11 @@ function! s:get_next_mrkr(item) "{{{
     let new_mrkr = markers[(idx+1) % len(markers)]
   endif
   return new_mrkr
-endfunction "}}}
+endfunction
+
 
 "changes the marker of the given item to the previous in g:vimwiki_list_markers
-function! s:get_prev_mrkr(item) "{{{
+function! s:get_prev_mrkr(item)
   let markers = vimwiki#vars#get_syntaxlocal('list_markers')
   if a:item.type == 0
     return markers[-1]
@@ -1208,12 +1272,12 @@ function! s:get_prev_mrkr(item) "{{{
   if idx == -1
     return markers[-1]
   else
-    return markers[(idx - 1 + len(markers)) %
-          \ len(markers)]
+    return markers[(idx - 1 + len(markers)) % len(markers)]
   endif
-endfunction "}}}
+endfunction
 
-function! s:set_new_mrkr(item, new_mrkr) "{{{
+
+function! s:set_new_mrkr(item, new_mrkr)
   if a:item.type == 0
     call s:substitute_rx_in_line(a:item.lnum, '^\s*\zs\ze', a:new_mrkr.' ')
     if indent(a:item.lnum) == 0 && !vimwiki#vars#get_syntaxlocal('recurring_bullets')
@@ -1222,9 +1286,10 @@ function! s:set_new_mrkr(item, new_mrkr) "{{{
   else
     call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, a:new_mrkr)
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
+
+function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode)
   let cur_col_from_eol = col("$") - (a:mode ==# "i" ? col("'^") : col('.'))
   let new_mrkr = a:new_mrkr
   let cur_ln = a:from_line
@@ -1241,25 +1306,23 @@ function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
     if index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(new_mrkr)) > -1
       "use *** if the item above has *** too
       let item_above = s:get_prev_list_item(cur_item, 1)
-      if item_above.type == 1 &&
-            \ s:first_char(item_above.mrkr) ==# s:first_char(new_mrkr)
+      if item_above.type == 1 && s:first_char(item_above.mrkr) ==# s:first_char(new_mrkr)
         let new_mrkr = item_above.mrkr
       else
         "use *** if the item below has *** too
         let item_below = s:get_next_list_item(cur_item, 1)
-        if item_below.type == 1 &&
-              \ s:first_char(item_below.mrkr) ==# s:first_char(new_mrkr)
+        if item_below.type == 1 && s:first_char(item_below.mrkr) ==# s:first_char(new_mrkr)
           let new_mrkr = item_below.mrkr
         else
           "if the old is ### and the new is * use ***
           if cur_item.type == 1 &&
-                \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(cur_item.mrkr))>-1
+                \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'),
+                \ s:first_char(cur_item.mrkr))>-1
             let new_mrkr = repeat(new_mrkr, s:string_length(cur_item.mrkr))
           else
             "use *** if the parent item has **
             let parent_item = s:get_parent(cur_item)
-            if parent_item.type == 1 &&
-                  \ s:first_char(parent_item.mrkr) ==# s:first_char(new_mrkr)
+            if parent_item.type == 1 && s:first_char(parent_item.mrkr) ==# s:first_char(new_mrkr)
               let new_mrkr = repeat(s:first_char(parent_item.mrkr),
                     \ s:string_length(parent_item.mrkr)+1)
             endif
@@ -1277,9 +1340,10 @@ function! vimwiki#lst#change_marker(from_line, to_line, new_mrkr, mode) "{{{
   endwhile
 
   call cursor('.', col('$') - cur_col_from_eol)
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{
+
+function! vimwiki#lst#change_marker_in_list(new_mrkr)
   let cur_item = s:get_corresponding_item(line('.'))
   let first_item = s:get_first_item_in_list(cur_item, 0)
   let last_item = s:get_last_item_in_list(cur_item, 0)
@@ -1293,10 +1357,11 @@ function! vimwiki#lst#change_marker_in_list(new_mrkr) "{{{
   endwhile
 
   call s:adjust_numbered_list(s:get_item(first_item_line), 0, 0)
-endfunction "}}}
+endfunction
+
 
 "sets kind of the item depending on neighbor items and the parent item
-function! s:adjust_mrkr(item) "{{{
+function! s:adjust_mrkr(item)
   if a:item.type == 0 || vimwiki#vars#get_syntaxlocal('recurring_bullets')
     return
   endif
@@ -1309,20 +1374,20 @@ function! s:adjust_mrkr(item) "{{{
 
   "if possible, set e.g. *** if parent has ** as marker
   if neighbor_item.type == 0 && a:item.type == 1 &&
-        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'), s:first_char(a:item.mrkr)) > -1
+        \ index(vimwiki#vars#get_syntaxlocal('multiple_bullet_chars'),
+        \ s:first_char(a:item.mrkr)) > -1
     let parent_item = s:get_parent(a:item)
-    if parent_item.type == 1 &&
-          \ s:first_char(parent_item.mrkr) ==# s:first_char(a:item.mrkr)
-      let new_mrkr = repeat(s:first_char(parent_item.mrkr),
-            \ s:string_length(parent_item.mrkr)+1)
+    if parent_item.type == 1 && s:first_char(parent_item.mrkr) ==# s:first_char(a:item.mrkr)
+      let new_mrkr = repeat(s:first_char(parent_item.mrkr), s:string_length(parent_item.mrkr)+1)
     endif
   endif
 
   call s:substitute_string_in_line(a:item.lnum, a:item.mrkr, new_mrkr)
   call s:adjust_numbered_list(a:item, 0, 1)
-endfunction "}}}
+endfunction
 
-function! s:clone_marker_from_to(from, to) "{{{
+
+function! s:clone_marker_from_to(from, to)
   let item_from = s:get_item(a:from)
   if item_from.type == 0 | return | endif
   let new_mrkr = item_from.mrkr . ' '
@@ -1337,9 +1402,10 @@ function! s:clone_marker_from_to(from, to) "{{{
     let adjust_from = ( a:from < a:to ? a:from : a:to )
     call s:adjust_numbered_list_below(s:get_item(adjust_from), 0)
   endif
-endfunction "}}}
+endfunction
 
-function! s:remove_mrkr(item) "{{{
+
+function! s:remove_mrkr(item)
   let item = a:item
   if item.cb != ''
     let item = s:remove_cb(item)
@@ -1353,9 +1419,10 @@ function! s:remove_mrkr(item) "{{{
   let item.type = 0
   call s:update_state(parent_item)
   return item
-endfunction "}}}
+endfunction
 
-function! s:create_marker(lnum) "{{{
+
+function! s:create_marker(lnum)
   let new_sibling = s:get_corresponding_item(a:lnum)
   if new_sibling.type == 0
     let new_sibling = s:get_a_neighbor_item_in_column(a:lnum, virtcol('.'))
@@ -1367,12 +1434,14 @@ function! s:create_marker(lnum) "{{{
     call s:set_new_mrkr(cur_item, vimwiki#vars#get_syntaxlocal('list_markers')[0])
     call s:adjust_numbered_list(cur_item, 0, 0)
   endif
-endfunction "}}}
+endfunction
 
-"change markers of list items }}}
 
-"handle keys {{{
-function! vimwiki#lst#kbd_o() "{{{
+" ---------------------------------------------------------
+" handle keys
+" ---------------------------------------------------------
+
+function! vimwiki#lst#kbd_o()
   let fold_end = foldclosedend('.')
   let lnum = (fold_end == -1) ? line('.') : fold_end
   let cur_item = s:get_item(lnum)
@@ -1385,9 +1454,10 @@ function! vimwiki#lst#kbd_o() "{{{
     call s:clone_marker_from_to(cur_item.lnum, cur_item.lnum+1)
   endif
   startinsert!
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#kbd_O() "{{{
+
+function! vimwiki#lst#kbd_O()
   normal! Ox
   let cur_ln = line('.')
   if getline(cur_ln+1) !~# '^\s*$'
@@ -1396,9 +1466,10 @@ function! vimwiki#lst#kbd_O() "{{{
     call s:clone_marker_from_to(cur_ln-1, cur_ln)
   endif
   startinsert!
-endfunction "}}}
+endfunction
 
-function! s:cr_on_empty_list_item(lnum, behavior) "{{{
+
+function! s:cr_on_empty_list_item(lnum, behavior)
   if a:behavior == 1
     "just make a new list item
     normal! gi

@@ -1452,18 +1523,20 @@ function! s:cr_on_empty_list_item(lnum, behavior) "{{{
     endif
     return
   endif
-endfunction "}}}
+endfunction
 
-function! s:cr_on_empty_line(lnum, behavior) "{{{
+
+function! s:cr_on_empty_line(lnum, behavior)
   "inserting and deleting the x is necessary
   "because otherwise the indent is lost
   normal! gi
x
   if a:behavior == 2 || a:behavior == 3
     call s:create_marker(a:lnum+1)
   endif
-endfunction "}}}
+endfunction
 
-function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
+
+function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol)
   if a:insert_new_marker
     "the ultimate feature of this script: make new marker on <CR>
     normal! gi

@@ -1479,9 +1552,10 @@ function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
     let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
     call s:indent_multiline(prev_line, a:lnum+1)
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#lst#kbd_cr(normal, just_mrkr) "{{{
+
+function! vimwiki#lst#kbd_cr(normal, just_mrkr)
   let lnum = line('.')
   let has_bp = s:line_has_marker(lnum)
 
@@ -1527,10 +1601,11 @@ function! vimwiki#lst#kbd_cr(normal, just_mrkr) "{{{
     startinsert
   endif
 
-endfunction "}}}
+endfunction
+
 
 "creates a list item in the current line or removes it
-function! vimwiki#lst#toggle_list_item() "{{{
+function! vimwiki#lst#toggle_list_item()
   let cur_col_from_eol = col("$") - col("'^")
   let cur_item = s:get_item(line('.'))
 
@@ -1559,12 +1634,14 @@ function! vimwiki#lst#toggle_list_item() "{{{
   else
     startinsert
   endif
-endfunction "}}}
+endfunction
 
-"handle keys }}}
 
-"misc stuff {{{
-function! vimwiki#lst#TO_list_item(inner, visual) "{{{
+" ---------------------------------------------------------
+" misc stuff
+" ---------------------------------------------------------
+
+function! vimwiki#lst#TO_list_item(inner, visual)
   let lnum = prevnonblank('.')
   let item = s:get_corresponding_item(lnum)
   if item.type == 0
@@ -1580,9 +1657,10 @@ function! vimwiki#lst#TO_list_item(inner, visual) "{{{
   call cursor(to_line, 0)
   normal! o
   call cursor(from_line, 0)
-endfunction "}}}
+endfunction
 
-fun! vimwiki#lst#fold_level(lnum) "{{{
+
+function! vimwiki#lst#fold_level(lnum)
   let cur_item = s:get_item(a:lnum)
   if cur_item.type != 0
     let parent_item = s:get_parent(cur_item)
@@ -1595,6 +1673,5 @@ fun! vimwiki#lst#fold_level(lnum) "{{{
     endif
   endif
   return '='
-endf "}}}
+endfunction
 
-"misc stuff }}}
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index f4b61a1..6468c75 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -1,20 +1,17 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Link functions for markdown syntax
+" Description: Link functions for markdown syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
 
-" MISC helper functions {{{
-
-" s:safesubstitute
-function! s:safesubstitute(text, search, replace, mode) "{{{
+function! s:safesubstitute(text, search, replace, mode)
   " Substitute regexp but do not interpret replace
   let escaped = escape(a:replace, '\&')
   return substitute(a:text, a:search, escaped, a:mode)
-endfunction " }}}
+endfunction
 
-" vimwiki#markdown_base#scan_reflinks
-function! vimwiki#markdown_base#scan_reflinks() " {{{
+
+function! vimwiki#markdown_base#scan_reflinks()
   let mkd_refs = {}
   " construct list of references using vimgrep
   try
@@ -23,7 +20,7 @@ function! vimwiki#markdown_base#scan_reflinks() " {{{
   catch /^Vim\%((\a\+)\)\=:E480/   " No Match
     "Ignore it, and move on to the next file
   endtry
-  " 
+
   for d in getqflist()
     let matchline = join(getline(d.lnum, min([d.lnum+1, line('$')])), ' ')
     let descr = matchstr(matchline, vimwiki#vars#get_syntaxlocal('rxMkdRefMatchDescr'))
@@ -34,12 +31,11 @@ function! vimwiki#markdown_base#scan_reflinks() " {{{
   endfor
   call vimwiki#vars#set_bufferlocal('markdown_refs', mkd_refs)
   return mkd_refs
-endfunction "}}}
+endfunction
 
 
-" vimwiki#markdown_base#open_reflink
 " try markdown reference links
-function! vimwiki#markdown_base#open_reflink(link) " {{{
+function! vimwiki#markdown_base#open_reflink(link)
   " echom "vimwiki#markdown_base#open_reflink"
   let link = a:link
   let mkd_refs = vimwiki#vars#get_bufferlocal('markdown_refs')
@@ -50,15 +46,10 @@ function! vimwiki#markdown_base#open_reflink(link) " {{{
   else
     return 0
   endif
-endfunction " }}}
-" }}}
+endfunction
 
-" WIKI link following functions {{{
 
-" LINK functions {{{
-
-" s:normalize_link_syntax_n
-function! s:normalize_link_syntax_n() " {{{
+function! s:normalize_link_syntax_n()
   let lnum = line('.')
 
   " try WikiIncl
@@ -72,27 +63,30 @@ function! s:normalize_link_syntax_n() " {{{
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_syntaxlocal('WikiLink1Template2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink0'), sub)
     return
   endif
-  
+
   " try WikiLink1: replace with WikiLink0
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchUrl'),
+          \ vimwiki#vars#get_syntaxlocal('rxWikiLinkMatchDescr'),
           \ vimwiki#vars#get_global('WikiLinkTemplate2'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), sub)
     return
   endif
-  
+
   " try Weblink
   let lnk = vimwiki#base#matchstr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink'))
   if !empty(lnk)
     let sub = vimwiki#base#normalize_link_helper(lnk,
-          \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'), vimwiki#vars#get_syntaxlocal('rxWeblinkMatchDescr'),
+          \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'),
+          \ vimwiki#vars#get_syntaxlocal('rxWeblinkMatchDescr'),
           \ vimwiki#vars#get_syntaxlocal('Weblink1Template'))
     call vimwiki#base#replacestr_at_cursor(vimwiki#vars#get_syntaxlocal('rxWeblink'), sub)
     return
@@ -110,10 +104,10 @@ function! s:normalize_link_syntax_n() " {{{
     return
   endif
 
-endfunction " }}}
+endfunction
 
-" s:normalize_link_syntax_v
-function! s:normalize_link_syntax_v() " {{{
+
+function! s:normalize_link_syntax_v()
   let lnum = line('.')
   let sel_save = &selection
   let &selection = "old"
@@ -138,10 +132,10 @@ function! s:normalize_link_syntax_v() " {{{
     let &selection = sel_save
   endtry
 
-endfunction " }}}
+endfunction
 
-" vimwiki#base#normalize_link
-function! vimwiki#markdown_base#normalize_link(is_visual_mode) "{{{
+
+function! vimwiki#markdown_base#normalize_link(is_visual_mode)
   if 0
     " Syntax-specific links
   else
@@ -152,11 +146,5 @@ function! vimwiki#markdown_base#normalize_link(is_visual_mode) "{{{
       call s:normalize_link_syntax_v()
     endif
   endif
-endfunction "}}}
-
-" }}}
-
-" -------------------------------------------------------------------------
-" Load syntax-specific Wiki functionality
-" -------------------------------------------------------------------------
+endfunction
 
diff --git a/autoload/vimwiki/path.vim b/autoload/vimwiki/path.vim
index e7f78fb..367b1d7 100644
--- a/autoload/vimwiki/path.vim
+++ b/autoload/vimwiki/path.vim
@@ -1,15 +1,15 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Path manipulation functions
+" Description: Path manipulation functions
 " Home: https://github.com/vimwiki/vimwiki/
 
 
-function! vimwiki#path#chomp_slash(str) "{{{
+function! vimwiki#path#chomp_slash(str)
   return substitute(a:str, '[/\\]\+$', '', '')
-endfunction "}}}
+endfunction
+
 
 " Define path-compare function, either case-sensitive or not, depending on OS.
-"{{{ " function! vimwiki#path#is_equal(p1, p2)
 if vimwiki#u#is_windows()
   function! vimwiki#path#is_equal(p1, p2)
     return a:p1 ==? a:p2
@@ -18,10 +18,11 @@ else
   function! vimwiki#path#is_equal(p1, p2)
     return a:p1 ==# a:p2
   endfunction
-endif "}}}
+endif
+
 
 " collapse sections like /a/b/../c to /a/c
-function! vimwiki#path#normalize(path) "{{{
+function! vimwiki#path#normalize(path)
   let path = a:path
   while 1
     let result = substitute(path, '/[^/]\+/\.\.', '', '')
@@ -31,9 +32,10 @@ function! vimwiki#path#normalize(path) "{{{
     let path = result
   endwhile
   return result
-endfunction "}}}
+endfunction
 
-function! vimwiki#path#path_norm(path) "{{{
+
+function! vimwiki#path#path_norm(path)
   " /-slashes
   if a:path !~# '^scp:'
     let path = substitute(a:path, '\', '/', 'g')
@@ -44,21 +46,24 @@ function! vimwiki#path#path_norm(path) "{{{
   else
     return a:path
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#path#is_link_to_dir(link) "{{{
+
+function! vimwiki#path#is_link_to_dir(link)
   " Check if link is to a directory.
   " It should be ended with \ or /.
   return a:link =~# '\m[/\\]$'
-endfunction "}}}
+endfunction
 
-function! vimwiki#path#abs_path_of_link(link) "{{{
+
+function! vimwiki#path#abs_path_of_link(link)
   return vimwiki#path#normalize(expand("%:p:h").'/'.a:link)
-endfunction "}}}
+endfunction
+
 
 " return longest common path prefix of 2 given paths.
 " '~/home/usrname/wiki', '~/home/usrname/wiki/shmiki' => '~/home/usrname/wiki'
-function! vimwiki#path#path_common_pfx(path1, path2) "{{{
+function! vimwiki#path#path_common_pfx(path1, path2)
   let p1 = split(a:path1, '[/\\]', 1)
   let p2 = split(a:path2, '[/\\]', 1)
 
@@ -72,16 +77,17 @@ function! vimwiki#path#path_common_pfx(path1, path2) "{{{
   else
     return join(p1[: idx-1], '/')
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#path#wikify_path(path) "{{{
+
+function! vimwiki#path#wikify_path(path)
   let result = resolve(fnamemodify(a:path, ':p'))
   if vimwiki#u#is_windows()
     let result = substitute(result, '\\', '/', 'g')
   endif
   let result = vimwiki#path#chomp_slash(result)
   return result
-endfunction "}}}
+endfunction
 
 
 function! vimwiki#path#current_wiki_file()
@@ -90,7 +96,7 @@ endfunction
 
 
 " Returns: the relative path from a:dir to a:file
-function! vimwiki#path#relpath(dir, file) "{{{
+function! vimwiki#path#relpath(dir, file)
   let result = []
   let dir = split(a:dir, '/')
   let file = split(a:file, '/')
@@ -112,12 +118,13 @@ function! vimwiki#path#relpath(dir, file) "{{{
     let result_path .= '/'
   endif
   return result_path
-endfunction "}}}
+endfunction
+
 
 " If the optional argument provided and nonzero,
-" it will ask before creating a directory 
+" it will ask before creating a directory
 " Returns: 1 iff directory exists or successfully created
-function! vimwiki#path#mkdir(path, ...) "{{{
+function! vimwiki#path#mkdir(path, ...)
   let path = expand(a:path)
 
   if path =~# '^scp:'
@@ -137,23 +144,23 @@ function! vimwiki#path#mkdir(path, ...) "{{{
       let path = iconv(path, &enc, vimwiki#vars#get_global('w32_dir_enc'))
     endif
 
-    if a:0 && a:1 && input("Vimwiki: Make new directory: "
-          \ .path."\n [y]es/[N]o? ") !~? '^y'
+    if a:0 && a:1 && input("Vimwiki: Make new directory: ".path."\n [y]es/[N]o? ") !~? '^y'
       return 0
     endif
 
     call mkdir(path, "p")
     return 1
   endif
-endfunction " }}}
+endfunction
 
-function! vimwiki#path#is_absolute(path) "{{{
+
+function! vimwiki#path#is_absolute(path)
   if vimwiki#u#is_windows()
     return a:path =~? '\m^\a:'
   else
     return a:path =~# '\m^/\|\~/'
   endif
-endfunction "}}}
+endfunction
 
 
 " Combine a directory and a file into one path, doesn't generate duplicate
@@ -173,3 +180,4 @@ else
     return directory . '/' . file
   endfunction
 endif
+
diff --git a/autoload/vimwiki/tags.vim b/autoload/vimwiki/tags.vim
index dd03ee4..e802bce 100644
--- a/autoload/vimwiki/tags.vim
+++ b/autoload/vimwiki/tags.vim
@@ -1,9 +1,11 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
 
 
 let s:TAGS_METADATA_FILE_NAME = '.tags'
 
+
+
 " Tags metadata in-memory format:
 " metadata := { 'pagename': [entries, ...] }
 " entry := { 'tagname':..., 'lineno':..., 'link':... }
@@ -19,12 +21,13 @@ let s:TAGS_METADATA_FILE_NAME = '.tags'
 " an optional field, "vimwiki:".  In this field, we encode tab-separated values
 " of missing parameters -- "pagename" and "link".
 
-" vimwiki#tags#update_tags
+
+
 "   Update tags metadata.
 "   a:full_rebuild == 1: re-scan entire wiki
 "   a:full_rebuild == 0: only re-scan current page
 "   a:all_files == '':   only if the file is newer than .tags
-function! vimwiki#tags#update_tags(full_rebuild, all_files) "{{{
+function! vimwiki#tags#update_tags(full_rebuild, all_files)
   let all_files = a:all_files != ''
   if !a:full_rebuild
     " Updating for one page (current)
@@ -42,8 +45,7 @@ function! vimwiki#tags#update_tags(full_rebuild, all_files) "{{{
   else " full rebuild
     let files = vimwiki#base#find_files(vimwiki#vars#get_bufferlocal('wiki_nr'), 0)
     let wiki_base_dir = vimwiki#vars#get_wikilocal('path')
-    let tags_file_last_modification =
-          \ getftime(vimwiki#tags#metadata_file_path())
+    let tags_file_last_modification = getftime(vimwiki#tags#metadata_file_path())
     let metadata = s:load_tags_metadata()
     for file in files
       if all_files || getftime(file) >= tags_file_last_modification
@@ -56,12 +58,11 @@ function! vimwiki#tags#update_tags(full_rebuild, all_files) "{{{
     endfor
     call s:write_tags_metadata(metadata)
   endif
-endfunction " }}}
+endfunction
 
-" s:scan_tags
-"   Scans the list of text lines (argument) and produces tags metadata as a
-"   list of tag entries.
-function! s:scan_tags(lines, page_name) "{{{
+
+"   Scans the list of text lines (argument) and produces tags metadata as a list of tag entries.
+function! s:scan_tags(lines, page_name)
 
   let entries = []
 
@@ -136,17 +137,18 @@ function! s:scan_tags(lines, page_name) "{{{
 
   endfor " loop over lines
   return entries
-endfunction " }}}
+endfunction
+
 
-" vimwiki#tags#metadata_file_path
 "   Returns tags metadata file path
-function! vimwiki#tags#metadata_file_path() abort "{{{
-  return fnamemodify(vimwiki#path#join_path(vimwiki#vars#get_wikilocal('path'), s:TAGS_METADATA_FILE_NAME), ':p')
-endfunction " }}}
+function! vimwiki#tags#metadata_file_path() abort
+  return fnamemodify(vimwiki#path#join_path(vimwiki#vars#get_wikilocal('path'),
+        \ s:TAGS_METADATA_FILE_NAME), ':p')
+endfunction
+
 
-" s:load_tags_metadata
 "   Loads tags metadata from file, returns a dictionary
-function! s:load_tags_metadata() abort "{{{
+function! s:load_tags_metadata() abort
   let metadata_path = vimwiki#tags#metadata_file_path()
   if !filereadable(metadata_path)
     return {}
@@ -193,29 +195,29 @@ function! s:load_tags_metadata() abort "{{{
     endif
   endfor
   return metadata
-endfunction " }}}
+endfunction
+
 
-" s:remove_page_from_tags
 "   Removes all entries for given page from metadata in-place.  Returns updated
 "   metadata (just in case).
-function! s:remove_page_from_tags(metadata, page_name) "{{{
+function! s:remove_page_from_tags(metadata, page_name)
   if has_key(a:metadata, a:page_name)
     call remove(a:metadata, a:page_name)
     return a:metadata
   else
     return a:metadata
   endif
-endfunction " }}}
+endfunction
+
 
-" s:merge_tags
 "   Merges metadata of one file into a:metadata
-function! s:merge_tags(metadata, pagename, file_metadata) "{{{
+function! s:merge_tags(metadata, pagename, file_metadata)
   let metadata = a:metadata
   let metadata[a:pagename] = a:file_metadata
   return metadata
-endfunction " }}}
+endfunction
+
 
-" s:tags_entry_cmp
 "   Compares two actual lines from tags file.  Return value is in strcmp style.
 "   See help on sort() -- that's what this function is going to be used for.
 "   See also s:write_tags_metadata below -- that's where we compose these tags
@@ -225,7 +227,7 @@ endfunction " }}}
 "   numbers as strings, not integers, and so, for example, tag at line 14
 "   preceeds the same tag on the same page at line 9.  (Because string "14" is
 "   alphabetically 'less than' string "9".)
-function! s:tags_entry_cmp(i1, i2) "{{{
+function! s:tags_entry_cmp(i1, i2)
   let items = []
   for orig_item in [a:i1, a:i2]
     let fields = split(orig_item, "\t")
@@ -245,11 +247,11 @@ function! s:tags_entry_cmp(i1, i2) "{{{
   else
     return 0
   endif
-endfunction " }}}
+endfunction
+
 
-" s:write_tags_metadata
 "   Saves metadata object into a file. Throws exceptions in case of problems.
-function! s:write_tags_metadata(metadata) "{{{
+function! s:write_tags_metadata(metadata)
   let metadata_path = vimwiki#tags#metadata_file_path()
   let tags = []
   for pagename in keys(a:metadata)
@@ -271,11 +273,11 @@ function! s:write_tags_metadata(metadata) "{{{
   call sort(tags, "s:tags_entry_cmp")
   call insert(tags, "!_TAG_FILE_SORTED\t1\t")
   call writefile(tags, metadata_path)
-endfunction " }}}
+endfunction
+
 
-" vimwiki#tags#get_tags
 "   Returns list of unique tags found in the .tags file
-function! vimwiki#tags#get_tags() "{{{
+function! vimwiki#tags#get_tags()
   let metadata = s:load_tags_metadata()
   let tags = {}
   for entries in values(metadata)
@@ -284,13 +286,13 @@ function! vimwiki#tags#get_tags() "{{{
     endfor
   endfor
   return keys(tags)
-endfunction " }}}
+endfunction
+
 
-" vimwiki#tags#generate_tags
 "   Similar to vimwiki#base#generate_links.  In the current buffer, appends
 "   tags and references to all their instances.  If no arguments (tags) are
 "   specified, outputs all tags.
-function! vimwiki#tags#generate_tags(...) abort "{{{
+function! vimwiki#tags#generate_tags(...) abort
   let need_all_tags = (a:0 == 0)
   let specific_tags = a:000
 
@@ -309,8 +311,7 @@ function! vimwiki#tags#generate_tags(...) abort "{{{
   endfor
 
   let lines = []
-  let bullet = repeat(' ', vimwiki#lst#get_list_margin()).
-        \ vimwiki#lst#default_symbol().' '
+  let bullet = repeat(' ', vimwiki#lst#get_list_margin()).vimwiki#lst#default_symbol().' '
   for tagname in sort(keys(tags_entries))
     if need_all_tags || index(specific_tags, tagname) != -1
       call extend(lines, [
@@ -318,8 +319,8 @@ function! vimwiki#tags#generate_tags(...) abort "{{{
             \ substitute(vimwiki#vars#get_syntaxlocal('rxH2_Template'), '__Header__', tagname, ''),
             \ '' ])
       for taglink in sort(tags_entries[tagname])
-        call add(lines, bullet .
-              \ substitute(vimwiki#vars#get_global('WikiLinkTemplate1'), '__LinkUrl__', taglink, ''))
+        call add(lines, bullet . substitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
+              \ '__LinkUrl__', taglink, ''))
       endfor
     endif
   endfor
@@ -328,15 +329,14 @@ function! vimwiki#tags#generate_tags(...) abort "{{{
         \ .vimwiki#u#escape(vimwiki#lst#default_symbol()).' '
         \ .vimwiki#vars#get_syntaxlocal('rxWikiLink').'$\)'
 
-  call vimwiki#base#update_listing_in_buffer(lines, 'Generated Tags', links_rx,
-        \ line('$')+1, 1)
-endfunction " }}}
+  call vimwiki#base#update_listing_in_buffer(lines, 'Generated Tags', links_rx, line('$')+1, 1)
+endfunction
 
-" vimwiki#tags#complete_tags
-function! vimwiki#tags#complete_tags(ArgLead, CmdLine, CursorPos) abort " {{{
+
+function! vimwiki#tags#complete_tags(ArgLead, CmdLine, CursorPos) abort
   " We can safely ignore args if we use -custom=complete option, Vim engine
   " will do the job of filtering.
   let taglist = vimwiki#tags#get_tags()
   return join(taglist, "\n")
-endfunction " }}}
+endfunction
 
diff --git a/autoload/vimwiki/tbl.vim b/autoload/vimwiki/tbl.vim
index 53ea998..1c049ce 100644
--- a/autoload/vimwiki/tbl.vim
+++ b/autoload/vimwiki/tbl.vim
@@ -1,28 +1,29 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Tables
+" Description: Tables
 " | Easily | manageable | text  | tables | !       |
 " |--------|------------|-------|--------|---------|
 " | Have   | fun!       | Drink | tea    | Period. |
 "
 " Home: https://github.com/vimwiki/vimwiki/
 
-" Load only once {{{
+
+
 if exists("g:loaded_vimwiki_tbl_auto") || &cp
   finish
 endif
 let g:loaded_vimwiki_tbl_auto = 1
-"}}}
+
 
 let s:textwidth = &tw
 
 
-" Misc functions {{{
-function! s:rxSep() "{{{
+function! s:rxSep()
   return vimwiki#vars#get_syntaxlocal('rxTableSep')
-endfunction "}}}
+endfunction
 
-function! s:wide_len(str) "{{{
+
+function! s:wide_len(str)
   " vim73 has new function that gives correct string width.
   if exists("*strdisplaywidth")
     return strdisplaywidth(a:str)
@@ -42,42 +43,49 @@ function! s:wide_len(str) "{{{
     let &modified = savemodified
   endif
   return ret
-endfunction "}}}
+endfunction
 
-function! s:cell_splitter() "{{{
+
+function! s:cell_splitter()
   return '\s*'.s:rxSep().'\s*'
-endfunction "}}}
+endfunction
 
-function! s:sep_splitter() "{{{
+
+function! s:sep_splitter()
   return '-'.s:rxSep().'-'
-endfunction "}}}
+endfunction
 
-function! s:is_table(line) "{{{
-  return s:is_separator(a:line) || (a:line !~# s:rxSep().s:rxSep() && a:line =~# '^\s*'.s:rxSep().'.\+'.s:rxSep().'\s*$')
-endfunction "}}}
 
-function! s:is_separator(line) "{{{
+function! s:is_table(line)
+  return s:is_separator(a:line) ||
+        \ (a:line !~# s:rxSep().s:rxSep() && a:line =~# '^\s*'.s:rxSep().'.\+'.s:rxSep().'\s*$')
+endfunction
+
+
+function! s:is_separator(line)
   return a:line =~# '^\s*'.s:rxSep().'\(--\+'.s:rxSep().'\)\+\s*$'
-endfunction "}}}
+endfunction
 
-function! s:is_separator_tail(line) "{{{
+
+function! s:is_separator_tail(line)
   return a:line =~# '^\{-1}\%(\s*\|-*\)\%('.s:rxSep().'-\+\)\+'.s:rxSep().'\s*$'
-endfunction "}}}
+endfunction
 
-function! s:is_last_column(lnum, cnum) "{{{
+
+function! s:is_last_column(lnum, cnum)
   let line = strpart(getline(a:lnum), a:cnum - 1)
-  "echomsg "DEBUG is_last_column> ".(line =~# s:rxSep().'\s*$' && line !~# s:rxSep().'.*'.s:rxSep().'\s*$')
   return line =~# s:rxSep().'\s*$'  && line !~# s:rxSep().'.*'.s:rxSep().'\s*$'
- 
-endfunction "}}}
+endfunction
 
-function! s:is_first_column(lnum, cnum) "{{{
+
+function! s:is_first_column(lnum, cnum)
   let line = strpart(getline(a:lnum), 0, a:cnum - 1)
-  "echomsg "DEBUG is_first_column> ".(line =~# '^\s*'.s:rxSep() && line !~# '^\s*'.s:rxSep().'.*'.s:rxSep())
-  return line =~# '^\s*$' || (line =~# '^\s*'.s:rxSep() && line !~# '^\s*'.s:rxSep().'.*'.s:rxSep())
-endfunction "}}}
+  return line =~# '^\s*$' ||
+        \ (line =~# '^\s*'.s:rxSep() && line !~# '^\s*'.s:rxSep().'.*'.s:rxSep())
+endfunction
 
-function! s:count_separators_up(lnum) "{{{
+
+function! s:count_separators_up(lnum)
   let lnum = a:lnum - 1
   while lnum > 1
     if !s:is_separator(getline(lnum))
@@ -87,9 +95,10 @@ function! s:count_separators_up(lnum) "{{{
   endwhile
 
   return (a:lnum-lnum)
-endfunction "}}}
+endfunction
 
-function! s:count_separators_down(lnum) "{{{
+
+function! s:count_separators_down(lnum)
   let lnum = a:lnum + 1
   while lnum < line('$')
     if !s:is_separator(getline(lnum))
@@ -99,9 +108,10 @@ function! s:count_separators_down(lnum) "{{{
   endwhile
 
   return (lnum-a:lnum)
-endfunction "}}}
+endfunction
 
-function! s:create_empty_row(cols) "{{{
+
+function! s:create_empty_row(cols)
   let row = s:rxSep()
   let cell = "   ".s:rxSep()
 
@@ -110,9 +120,10 @@ function! s:create_empty_row(cols) "{{{
   endfor
 
   return row
-endfunction "}}}
+endfunction
 
-function! s:create_row_sep(cols) "{{{
+
+function! s:create_row_sep(cols)
   let row = s:rxSep()
   let cell = "---".s:rxSep()
 
@@ -121,9 +132,10 @@ function! s:create_row_sep(cols) "{{{
   endfor
 
   return row
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#get_cells(line) "{{{
+
+function! vimwiki#tbl#get_cells(line)
   let result = []
   let cell = ''
   let quote = ''
@@ -174,13 +186,15 @@ function! vimwiki#tbl#get_cells(line) "{{{
     call add(result, vimwiki#u#trim(cell.quote, '|'))
   endif
   return result
-endfunction "}}}
+endfunction
 
-function! s:col_count(lnum) "{{{
+
+function! s:col_count(lnum)
   return len(vimwiki#tbl#get_cells(getline(a:lnum)))
-endfunction "}}}
+endfunction
 
-function! s:get_indent(lnum) "{{{
+
+function! s:get_indent(lnum)
   if !s:is_table(getline(a:lnum))
     return
   endif
@@ -198,9 +212,10 @@ function! s:get_indent(lnum) "{{{
   endwhile
 
   return indent
-endfunction " }}}
+endfunction
 
-function! s:get_rows(lnum) "{{{
+
+function! s:get_rows(lnum)
   if !s:is_table(getline(a:lnum))
     return
   endif
@@ -232,9 +247,10 @@ function! s:get_rows(lnum) "{{{
   endwhile
 
   return upper_rows + lower_rows
-endfunction "}}}
+endfunction
 
-function! s:get_cell_max_lens(lnum, ...) "{{{
+
+function! s:get_cell_max_lens(lnum, ...)
   let max_lens = {}
   for [lnum, row] in s:get_rows(a:lnum)
     if s:is_separator(row)
@@ -251,9 +267,10 @@ function! s:get_cell_max_lens(lnum, ...) "{{{
     endfor
   endfor
   return max_lens
-endfunction "}}}
+endfunction
 
-function! s:get_aligned_rows(lnum, col1, col2) "{{{
+
+function! s:get_aligned_rows(lnum, col1, col2)
   let rows = s:get_rows(a:lnum)
   let startlnum = rows[0][0]
   let cells = []
@@ -271,10 +288,11 @@ function! s:get_aligned_rows(lnum, col1, col2) "{{{
     call add(result, [lnum, new_row])
   endfor
   return result
-endfunction "}}}
+endfunction
+
 
 " Number of the current column. Starts from 0.
-function! s:cur_column() "{{{
+function! s:cur_column()
   let line = getline('.')
   if !s:is_table(line)
     return -1
@@ -291,12 +309,10 @@ function! s:cur_column() "{{{
     endif
   endwhile
   return col
-endfunction "}}}
+endfunction
 
-" }}}
 
-" Format functions {{{
-function! s:fmt_cell(cell, max_len) "{{{
+function! s:fmt_cell(cell, max_len)
   let cell = ' '.a:cell.' '
 
   let diff = a:max_len - s:wide_len(a:cell)
@@ -306,9 +322,10 @@ function! s:fmt_cell(cell, max_len) "{{{
 
   let cell .= repeat(' ', diff)
   return cell
-endfunction "}}}
+endfunction
 
-function! s:fmt_row(cells, max_lens, col1, col2) "{{{
+
+function! s:fmt_row(cells, max_lens, col1, col2)
   let new_line = s:rxSep()
   for idx in range(len(a:cells))
     if idx == a:col1
@@ -326,17 +343,19 @@ function! s:fmt_row(cells, max_lens, col1, col2) "{{{
     let idx += 1
   endwhile
   return new_line
-endfunction "}}}
+endfunction
 
-function! s:fmt_cell_sep(max_len) "{{{
+
+function! s:fmt_cell_sep(max_len)
   if a:max_len == 0
     return repeat('-', 3)
   else
     return repeat('-', a:max_len+2)
   endif
-endfunction "}}}
+endfunction
 
-function! s:fmt_sep(max_lens, col1, col2) "{{{
+
+function! s:fmt_sep(max_lens, col1, col2)
   let new_line = s:rxSep()
   for idx in range(len(a:max_lens))
     if idx == a:col1
@@ -347,11 +366,10 @@ function! s:fmt_sep(max_lens, col1, col2) "{{{
     let new_line .= s:fmt_cell_sep(a:max_lens[idx]).s:rxSep()
   endfor
   return new_line
-endfunction "}}}
-"}}}
+endfunction
 
-" Keyboard functions "{{{
-function! s:kbd_create_new_row(cols, goto_first) "{{{
+
+function! s:kbd_create_new_row(cols, goto_first)
   let cmd = "\<ESC>o".s:create_empty_row(a:cols)
   let cmd .= "\<ESC>:call vimwiki#tbl#format(line('.'))\<CR>"
   let cmd .= "\<ESC>0"
@@ -364,26 +382,29 @@ function! s:kbd_create_new_row(cols, goto_first) "{{{
   let cmd .= "a"
 
   return cmd
-endfunction "}}}
+endfunction
 
-function! s:kbd_goto_next_row() "{{{
+
+function! s:kbd_goto_next_row()
   let cmd = "\<ESC>j"
   let cmd .= ":call search('.\\(".s:rxSep()."\\)', 'c', line('.'))\<CR>"
   let cmd .= ":call search('\\(".s:rxSep()."\\)\\zs', 'bc', line('.'))\<CR>"
   let cmd .= "a"
   return cmd
-endfunction "}}}
+endfunction
 
-function! s:kbd_goto_prev_row() "{{{
+
+function! s:kbd_goto_prev_row()
   let cmd = "\<ESC>k"
   let cmd .= ":call search('.\\(".s:rxSep()."\\)', 'c', line('.'))\<CR>"
   let cmd .= ":call search('\\(".s:rxSep()."\\)\\zs', 'bc', line('.'))\<CR>"
   let cmd .= "a"
   return cmd
-endfunction "}}}
+endfunction
+
 
 " Used in s:kbd_goto_next_col
-function! vimwiki#tbl#goto_next_col() "{{{
+function! vimwiki#tbl#goto_next_col()
   let curcol = virtcol('.')
   let lnum = line('.')
   let newcol = s:get_indent(lnum)
@@ -396,9 +417,10 @@ function! vimwiki#tbl#goto_next_col() "{{{
   endfor
   let newcol += 2 " +2 == 1 separator + 1 space |<space
   call vimwiki#u#cursor(lnum, newcol)
-endfunction "}}}
+endfunction
 
-function! s:kbd_goto_next_col(jumpdown) "{{{
+
+function! s:kbd_goto_next_col(jumpdown)
   let cmd = "\<ESC>"
   if a:jumpdown
     let seps = s:count_separators_down(line('.'))
@@ -406,10 +428,11 @@ function! s:kbd_goto_next_col(jumpdown) "{{{
   endif
   let cmd .= ":call vimwiki#tbl#goto_next_col()\<CR>a"
   return cmd
-endfunction "}}}
+endfunction
+
 
 " Used in s:kbd_goto_prev_col
-function! vimwiki#tbl#goto_prev_col() "{{{
+function! vimwiki#tbl#goto_prev_col()
   let curcol = virtcol('.')
   let lnum = line('.')
   let newcol = s:get_indent(lnum)
@@ -428,9 +451,10 @@ function! vimwiki#tbl#goto_prev_col() "{{{
   endfor
   let newcol += 2 " +2 == 1 separator + 1 space |<space
   call vimwiki#u#cursor(lnum, newcol)
-endfunction "}}}
+endfunction
 
-function! s:kbd_goto_prev_col(jumpup) "{{{
+
+function! s:kbd_goto_prev_col(jumpup)
   let cmd = "\<ESC>"
   if a:jumpup
     let seps = s:count_separators_up(line('.'))
@@ -442,12 +466,10 @@ function! s:kbd_goto_prev_col(jumpup) "{{{
   " let cmd .= "a"
   "echomsg "DEBUG kbd_goto_prev_col> ".cmd
   return cmd
-endfunction "}}}
+endfunction
 
-"}}}
 
-" Global functions {{{
-function! vimwiki#tbl#kbd_cr() "{{{
+function! vimwiki#tbl#kbd_cr()
   let lnum = line('.')
   if !s:is_table(getline(lnum))
     return ""
@@ -459,9 +481,10 @@ function! vimwiki#tbl#kbd_cr() "{{{
   else
     return s:kbd_goto_next_row()
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#kbd_tab() "{{{
+
+function! vimwiki#tbl#kbd_tab()
   let lnum = line('.')
   if !s:is_table(getline(lnum))
     return "\<Tab>"
@@ -475,9 +498,10 @@ function! vimwiki#tbl#kbd_tab() "{{{
     return s:kbd_create_new_row(cols, 1)
   endif
   return s:kbd_goto_next_col(is_sep || last)
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#kbd_shift_tab() "{{{
+
+function! vimwiki#tbl#kbd_shift_tab()
   let lnum = line('.')
   if !s:is_table(getline(lnum))
     return "\<S-Tab>"
@@ -490,9 +514,10 @@ function! vimwiki#tbl#kbd_shift_tab() "{{{
     return ""
   endif
   return s:kbd_goto_prev_col(is_sep || first)
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#format(lnum, ...) "{{{
+
+function! vimwiki#tbl#format(lnum, ...)
   if !(&filetype ==? 'vimwiki')
     return
   endif
@@ -520,11 +545,12 @@ function! vimwiki#tbl#format(lnum, ...) "{{{
     let row = indentstring.row
     call setline(lnum, row)
   endfor
-  
-  let &tw = s:textwidth
-endfunction "}}}
 
-function! vimwiki#tbl#create(...) "{{{
+  let &tw = s:textwidth
+endfunction
+
+
+function! vimwiki#tbl#create(...)
   if a:0 > 1
     let cols = a:1
     let rows = a:2
@@ -555,19 +581,21 @@ function! vimwiki#tbl#create(...) "{{{
   for r in range(rows - 1)
     call add(lines, row)
   endfor
-  
-  call append(line('.'), lines)
-endfunction "}}}
 
-function! vimwiki#tbl#align_or_cmd(cmd) "{{{
+  call append(line('.'), lines)
+endfunction
+
+
+function! vimwiki#tbl#align_or_cmd(cmd)
   if s:is_table(getline('.'))
     call vimwiki#tbl#format(line('.'))
   else
     exe 'normal! '.a:cmd
   endif
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#reset_tw(lnum) "{{{
+
+function! vimwiki#tbl#reset_tw(lnum)
   if !(&filetype ==? 'vimwiki')
     return
   endif
@@ -575,14 +603,14 @@ function! vimwiki#tbl#reset_tw(lnum) "{{{
   if !s:is_table(line)
     return
   endif
-  
+
   let s:textwidth = &tw
   let &tw = 0
-endfunction "}}}
+endfunction
 
-" TODO: move_column_left and move_column_right are good candidates to be
-" refactored.
-function! vimwiki#tbl#move_column_left() "{{{
+
+" TODO: move_column_left and move_column_right are good candidates to be refactored.
+function! vimwiki#tbl#move_column_left()
 
   "echomsg "DEBUG move_column_left: "
 
@@ -598,7 +626,7 @@ function! vimwiki#tbl#move_column_left() "{{{
   endif
 
   if cur_col > 0
-    call vimwiki#tbl#format(line('.'), cur_col-1, cur_col) 
+    call vimwiki#tbl#format(line('.'), cur_col-1, cur_col)
     call cursor(line('.'), 1)
 
     let sep = '\('.s:rxSep().'\).\zs'
@@ -608,16 +636,16 @@ function! vimwiki#tbl#move_column_left() "{{{
       let mpos = match(line, sep, mpos+1)
       if mpos != -1
         let col += 1
-      else 
+      else
         break
       endif
     endwhile
 
   endif
+endfunction
 
-endfunction "}}}
 
-function! vimwiki#tbl#move_column_right() "{{{
+function! vimwiki#tbl#move_column_right()
 
   let line = getline('.')
 
@@ -631,7 +659,7 @@ function! vimwiki#tbl#move_column_right() "{{{
   endif
 
   if cur_col < s:col_count(line('.'))-1
-    call vimwiki#tbl#format(line('.'), cur_col, cur_col+1) 
+    call vimwiki#tbl#format(line('.'), cur_col, cur_col+1)
     call cursor(line('.'), 1)
 
     let sep = '\('.s:rxSep().'\).\zs'
@@ -641,33 +669,35 @@ function! vimwiki#tbl#move_column_right() "{{{
       let mpos = match(line, sep, mpos+1)
       if mpos != -1
         let col += 1
-      else 
+      else
         break
       endif
     endwhile
-
   endif
+endfunction
 
-endfunction "}}}
 
-function! vimwiki#tbl#get_rows(lnum) "{{{
+function! vimwiki#tbl#get_rows(lnum)
   return s:get_rows(a:lnum)
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#is_table(line) "{{{
+
+function! vimwiki#tbl#is_table(line)
   return s:is_table(a:line)
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#is_separator(line) "{{{
+
+function! vimwiki#tbl#is_separator(line)
   return s:is_separator(a:line)
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#cell_splitter() "{{{
+
+function! vimwiki#tbl#cell_splitter()
   return s:cell_splitter()
-endfunction "}}}
+endfunction
 
-function! vimwiki#tbl#sep_splitter() "{{{
+
+function! vimwiki#tbl#sep_splitter()
   return s:sep_splitter()
-endfunction "}}}
+endfunction
 
-"}}}
diff --git a/autoload/vimwiki/u.vim b/autoload/vimwiki/u.vim
index c0142f2..c8f62ee 100644
--- a/autoload/vimwiki/u.vim
+++ b/autoload/vimwiki/u.vim
@@ -1,9 +1,9 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki autoload plugin file
-" Desc: Utility functions
+" Description: Utility functions
 " Home: https://github.com/vimwiki/vimwiki/
 
-function! vimwiki#u#trim(string, ...) "{{{
+function! vimwiki#u#trim(string, ...)
   let chars = ''
   if a:0 > 0
     let chars = a:1
@@ -11,17 +11,20 @@ function! vimwiki#u#trim(string, ...) "{{{
   let res = substitute(a:string, '^[[:space:]'.chars.']\+', '', '')
   let res = substitute(res, '[[:space:]'.chars.']\+$', '', '')
   return res
-endfunction "}}}
+endfunction
+
 
 " Builtin cursor doesn't work right with unicode characters.
-function! vimwiki#u#cursor(lnum, cnum) "{{{
+function! vimwiki#u#cursor(lnum, cnum)
   exe a:lnum
   exe 'normal! 0'.a:cnum.'|'
-endfunction "}}}
+endfunction
 
-function! vimwiki#u#is_windows() "{{{
+
+function! vimwiki#u#is_windows()
   return has("win32") || has("win64") || has("win95") || has("win16")
-endfunction "}}}
+endfunction
+
 
 function! vimwiki#u#is_macos()
   if has("mac") || has("macunix") || has("gui_mac")
@@ -32,27 +35,32 @@ function! vimwiki#u#is_macos()
   return os == 'Darwin' || os == 'Mac'
 endfunction
 
-function! vimwiki#u#count_first_sym(line) "{{{
+
+function! vimwiki#u#count_first_sym(line)
   let first_sym = matchstr(a:line, '\S')
   return len(matchstr(a:line, first_sym.'\+'))
-endfunction "}}}
+endfunction
 
-function! vimwiki#u#escape(string) "{{{
+
+function! vimwiki#u#escape(string)
   return escape(a:string, '~.*[]\^$')
-endfunction "}}}
+endfunction
+
 
 " Load concrete Wiki syntax: sets regexes and templates for headers and links
-function vimwiki#u#reload_regexes() "{{{
+function vimwiki#u#reload_regexes()
   execute 'runtime! syntax/vimwiki_'.vimwiki#vars#get_wikilocal('syntax').'.vim'
-endfunction "}}}
+endfunction
+
 
 " Load syntax-specific functionality
-function vimwiki#u#reload_regexes_custom() "{{{
+function vimwiki#u#reload_regexes_custom()
   execute 'runtime! syntax/vimwiki_'.vimwiki#vars#get_wikilocal('syntax').'_custom.vim'
-endfunction "}}}
+endfunction
+
 
 " Backward compatible version of the built-in function shiftwidth()
-if exists('*shiftwidth') "{{{
+if exists('*shiftwidth')
   func vimwiki#u#sw()
     return shiftwidth()
   endfunc
@@ -60,4 +68,5 @@ else
   func vimwiki#u#sw()
     return &sw
   endfunc
-endif "}}}
+endif
+
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 3efd8c6..82a6032 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -2,6 +2,8 @@
 " Vimwiki autoload plugin file
 " Home: https://github.com/vimwiki/vimwiki/
 
+
+
 " ------------------------------------------------------------------------------------------------
 " This file provides functions to manage the various state variables which are needed during a
 " Vimwiki session.
@@ -268,7 +270,7 @@ function! s:validate_settings()
 endfunction
 
 
-function! s:normalize_path(path) "{{{
+function! s:normalize_path(path)
   " trim trailing / and \ because otherwise resolve() doesn't work quite right
   let path = substitute(a:path, '[/\\]\+$', '', '')
   if path !~# '^scp:'
@@ -276,7 +278,7 @@ function! s:normalize_path(path) "{{{
   else
     return path.'/'
   endif
-endfunction "}}}
+endfunction
 
 
 function! vimwiki#vars#populate_syntax_vars(syntax)
@@ -703,7 +705,9 @@ function! vimwiki#vars#add_temporary_wiki(settings)
   call s:validate_settings()
 endfunction
 
+
 " number of registered wikis + temporary
 function! vimwiki#vars#number_of_wikis()
   return len(g:vimwiki_wikilocal_vars) - 1
 endfunction
+
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 0ed7bef..6b517dc 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -1,4 +1,4 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki filetype plugin file
 " Home: https://github.com/vimwiki/vimwiki/
 
@@ -8,7 +8,6 @@ endif
 let b:did_ftplugin = 1  " Don't load another plugin for this buffer
 
 
-" MISC STUFF {{{
 
 setlocal commentstring=%%%s
 
@@ -16,16 +15,14 @@ if vimwiki#vars#get_global('conceallevel') && exists("+conceallevel")
   let &l:conceallevel = vimwiki#vars#get_global('conceallevel')
 endif
 
-" GOTO FILE: gf {{{
+" This is for GOTO FILE: gf
 execute 'setlocal suffixesadd='.vimwiki#vars#get_wikilocal('ext')
 setlocal isfname-=[,]
-" gf}}}
 
 exe "setlocal tags+=" . escape(vimwiki#tags#metadata_file_path(), ' \|"')
 
-" MISC }}}
 
-" COMPLETION {{{
+
 function! Complete_wikifiles(findstart, base)
   if a:findstart == 1
     let column = col('.')-2
@@ -116,9 +113,9 @@ function! Complete_wikifiles(findstart, base)
 endfunction
 
 setlocal omnifunc=Complete_wikifiles
-" COMPLETION }}}
 
-" LIST STUFF {{{
+
+
 " settings necessary for the automatic formatting of lists
 setlocal autoindent
 setlocal nosmartindent
@@ -130,7 +127,6 @@ setlocal formatoptions-=o
 setlocal formatoptions-=2
 setlocal formatoptions+=n
 
-"Create 'formatlistpat'
 let &formatlistpat = vimwiki#vars#get_syntaxlocal('rxListItem')
 
 if !empty(&langmap)
@@ -146,17 +142,18 @@ if !empty(&langmap)
   endif
 endif
 
-" LIST STUFF }}}
 
-" FOLDING {{{
-" Folding list items {{{
-function! VimwikiFoldListLevel(lnum) "{{{
+
+" ------------------------------------------------
+" Folding stuff
+" ------------------------------------------------
+
+function! VimwikiFoldListLevel(lnum)
   return vimwiki#lst#fold_level(a:lnum)
-endfunction "}}}
-" Folding list items }}}
+endfunction
 
-" Folding sections and code blocks {{{
-function! VimwikiFoldLevel(lnum) "{{{
+
+function! VimwikiFoldLevel(lnum)
   let line = getline(a:lnum)
 
   " Header/section folding...
@@ -170,26 +167,29 @@ function! VimwikiFoldLevel(lnum) "{{{
   else
     return "="
   endif
+endfunction
 
-endfunction "}}}
 
-" Constants used by VimwikiFoldText {{{
+" Constants used by VimwikiFoldText
 " use \u2026 and \u21b2 (or \u2424) if enc=utf-8 to save screen space
 let s:ellipsis = (&enc ==? 'utf-8') ? "\u2026" : "..."
 let s:ell_len = strlen(s:ellipsis)
 let s:newline = (&enc ==? 'utf-8') ? "\u21b2 " : "  "
 let s:tolerance = 5
-" }}}
 
-function! s:shorten_text_simple(text, len) "{{{ unused
+
+" unused
+function! s:shorten_text_simple(text, len)
   let spare_len = a:len - len(a:text)
   return (spare_len>=0) ? [a:text,spare_len] : [a:text[0:a:len].s:ellipsis, -1]
-endfunction "}}}
+endfunction
+
 
 " s:shorten_text(text, len) = [string, spare] with "spare" = len-strlen(string)
 " for long enough "text", the string's length is within s:tolerance of "len"
 " (so that -s:tolerance <= spare <= s:tolerance, "string" ends with s:ellipsis)
-function! s:shorten_text(text, len) "{{{ returns [string, spare]
+function! s:shorten_text(text, len)
+  " returns [string, spare]
   " strlen() returns lenght in bytes, not in characters, so we'll have to do a
   " trick here -- replace all non-spaces with dot, calculate lengths and
   " indexes on it, then use original string to break at selected index.
@@ -202,11 +202,11 @@ function! s:shorten_text(text, len) "{{{ returns [string, spare]
   let newlen = a:len - s:ell_len
   let idx = strridx(text_pattern, ' ', newlen + s:tolerance)
   let break_idx = (idx + s:tolerance >= newlen) ? idx : newlen
-  return [matchstr(a:text, '\m^.\{'.break_idx.'\}').s:ellipsis,
-        \ newlen - break_idx]
-endfunction "}}}
+  return [matchstr(a:text, '\m^.\{'.break_idx.'\}').s:ellipsis, newlen - break_idx]
+endfunction
 
-function! VimwikiFoldText() "{{{
+
+function! VimwikiFoldText()
   let line = getline(v:foldstart)
   let main_text = substitute(line, '^\s*', repeat(' ',indent(v:foldstart)), '')
   let fold_len = v:foldend - v:foldstart + 1
@@ -226,12 +226,14 @@ function! VimwikiFoldText() "{{{
     endif
     return main_text.len_text.content_text
   endif
-endfunction "}}}
+endfunction
 
-" Folding sections and code blocks }}}
-" FOLDING }}}
 
-" COMMANDS {{{
+
+" ------------------------------------------------
+" Commands
+" ------------------------------------------------
+
 command! -buffer Vimwiki2HTML
       \ if filewritable(expand('%')) | silent noautocmd w | endif
       \ <bar>
@@ -289,7 +291,8 @@ command! -buffer -range -nargs=1 VimwikiListChangeSymbolI
 command! -buffer -nargs=1 VimwikiChangeSymbolInListTo
       \ call vimwiki#lst#change_marker_in_list(<f-args>)
 command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
-command! -buffer -range VimwikiToggleRejectedListItem call vimwiki#lst#toggle_rejected_cb(<line1>, <line2>)
+command! -buffer -range VimwikiToggleRejectedListItem
+      \ call vimwiki#lst#toggle_rejected_cb(<line1>, <line2>)
 command! -buffer -range VimwikiIncrementListItem call vimwiki#lst#increment_cb(<line1>, <line2>)
 command! -buffer -range VimwikiDecrementListItem call vimwiki#lst#decrement_cb(<line1>, <line2>)
 command! -buffer -range -nargs=+ VimwikiListChangeLvl
@@ -312,20 +315,25 @@ command! -buffer VimwikiDiaryNextDay call vimwiki#diary#goto_next_day()
 command! -buffer VimwikiDiaryPrevDay call vimwiki#diary#goto_prev_day()
 
 " tags commands
-command! -buffer -bang
-      \ VimwikiRebuildTags call vimwiki#tags#update_tags(1, '<bang>')
+command! -buffer -bang VimwikiRebuildTags call vimwiki#tags#update_tags(1, '<bang>')
 command! -buffer -nargs=* -complete=custom,vimwiki#tags#complete_tags
       \ VimwikiSearchTags VimwikiSearch /:<args>:/
 command! -buffer -nargs=* -complete=custom,vimwiki#tags#complete_tags
       \ VimwikiGenerateTags call vimwiki#tags#generate_tags(<f-args>)
 
-" COMMANDS }}}
+command! -buffer VimwikiPasteUrl call vimwiki#html#PasteUrl(expand('%:p'))
+command! -buffer VimwikiCatUrl call vimwiki#html#CatUrl(expand('%:p'))
+
+
+" ------------------------------------------------
+" Keybindings
+" ------------------------------------------------
 
-" KEYBINDINGS {{{
 if vimwiki#vars#get_global('use_mouse')
   nmap <buffer> <S-LeftMouse> <NOP>
   nmap <buffer> <C-LeftMouse> <NOP>
-  nnoremap <silent><buffer> <2-LeftMouse> :call vimwiki#base#follow_link('nosplit', 0, 1, "\<lt>2-LeftMouse>")<CR>
+  nnoremap <silent><buffer> <2-LeftMouse>
+        \ :call vimwiki#base#follow_link('nosplit', 0, 1, "\<lt>2-LeftMouse>")<CR>
   nnoremap <silent><buffer> <S-2-LeftMouse> <LeftMouse>:VimwikiSplitLink<CR>
   nnoremap <silent><buffer> <C-2-LeftMouse> <LeftMouse>:VimwikiVSplitLink<CR>
   nnoremap <silent><buffer> <RightMouse><LeftMouse> :VimwikiGoBackLink<CR>
@@ -335,44 +343,37 @@ endif
 if !hasmapto('<Plug>Vimwiki2HTML')
   exe 'nmap <buffer> '.vimwiki#vars#get_global('map_prefix').'h <Plug>Vimwiki2HTML'
 endif
-nnoremap <script><buffer>
-      \ <Plug>Vimwiki2HTML :Vimwiki2HTML<CR>
+nnoremap <script><buffer> <Plug>Vimwiki2HTML :Vimwiki2HTML<CR>
 
 if !hasmapto('<Plug>Vimwiki2HTMLBrowse')
   exe 'nmap <buffer> '.vimwiki#vars#get_global('map_prefix').'hh <Plug>Vimwiki2HTMLBrowse'
 endif
-nnoremap <script><buffer>
-      \ <Plug>Vimwiki2HTMLBrowse :Vimwiki2HTMLBrowse<CR>
+nnoremap <script><buffer> <Plug>Vimwiki2HTMLBrowse :Vimwiki2HTMLBrowse<CR>
 
 if !hasmapto('<Plug>VimwikiFollowLink')
   nmap <silent><buffer> <CR> <Plug>VimwikiFollowLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiFollowLink :VimwikiFollowLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiFollowLink :VimwikiFollowLink<CR>
 
 if !hasmapto('<Plug>VimwikiSplitLink')
   nmap <silent><buffer> <S-CR> <Plug>VimwikiSplitLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiSplitLink :VimwikiSplitLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiSplitLink :VimwikiSplitLink<CR>
 
 if !hasmapto('<Plug>VimwikiVSplitLink')
   nmap <silent><buffer> <C-CR> <Plug>VimwikiVSplitLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiVSplitLink :VimwikiVSplitLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiVSplitLink :VimwikiVSplitLink<CR>
 
 if !hasmapto('<Plug>VimwikiNormalizeLink')
   nmap <silent><buffer> + <Plug>VimwikiNormalizeLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiNormalizeLink :VimwikiNormalizeLink 0<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiNormalizeLink :VimwikiNormalizeLink 0<CR>
 
 if !hasmapto('<Plug>VimwikiNormalizeLinkVisual')
   vmap <silent><buffer> + <Plug>VimwikiNormalizeLinkVisual
 endif
-vnoremap <silent><script><buffer>
-      \ <Plug>VimwikiNormalizeLinkVisual :<C-U>VimwikiNormalizeLink 1<CR>
+vnoremap <silent><script><buffer> <Plug>VimwikiNormalizeLinkVisual :<C-U>VimwikiNormalizeLink 1<CR>
 
 if !hasmapto('<Plug>VimwikiNormalizeLinkVisualCR')
   vmap <silent><buffer> <CR> <Plug>VimwikiNormalizeLinkVisualCR
@@ -384,50 +385,42 @@ if !hasmapto('<Plug>VimwikiTabnewLink')
   nmap <silent><buffer> <D-CR> <Plug>VimwikiTabnewLink
   nmap <silent><buffer> <C-S-CR> <Plug>VimwikiTabnewLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiTabnewLink :VimwikiTabnewLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiTabnewLink :VimwikiTabnewLink<CR>
 
 if !hasmapto('<Plug>VimwikiGoBackLink')
   nmap <silent><buffer> <BS> <Plug>VimwikiGoBackLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiGoBackLink :VimwikiGoBackLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiGoBackLink :VimwikiGoBackLink<CR>
 
 if !hasmapto('<Plug>VimwikiNextLink')
   nmap <silent><buffer> <TAB> <Plug>VimwikiNextLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiNextLink :VimwikiNextLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiNextLink :VimwikiNextLink<CR>
 
 if !hasmapto('<Plug>VimwikiPrevLink')
   nmap <silent><buffer> <S-TAB> <Plug>VimwikiPrevLink
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiPrevLink :VimwikiPrevLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiPrevLink :VimwikiPrevLink<CR>
 
 if !hasmapto('<Plug>VimwikiDeleteLink')
   exe 'nmap <silent><buffer> '.vimwiki#vars#get_global('map_prefix').'d <Plug>VimwikiDeleteLink'
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiDeleteLink :VimwikiDeleteLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiDeleteLink :VimwikiDeleteLink<CR>
 
 if !hasmapto('<Plug>VimwikiRenameLink')
   exe 'nmap <silent><buffer> '.vimwiki#vars#get_global('map_prefix').'r <Plug>VimwikiRenameLink'
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiRenameLink :VimwikiRenameLink<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiRenameLink :VimwikiRenameLink<CR>
 
 if !hasmapto('<Plug>VimwikiDiaryNextDay')
   nmap <silent><buffer> <C-Down> <Plug>VimwikiDiaryNextDay
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiDiaryNextDay :VimwikiDiaryNextDay<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiDiaryNextDay :VimwikiDiaryNextDay<CR>
 
 if !hasmapto('<Plug>VimwikiDiaryPrevDay')
   nmap <silent><buffer> <C-Up> <Plug>VimwikiDiaryPrevDay
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiDiaryPrevDay :VimwikiDiaryPrevDay<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiDiaryPrevDay :VimwikiDiaryPrevDay<CR>
 
 " List mappings
 if !hasmapto('<Plug>VimwikiToggleListItem')
@@ -442,10 +435,8 @@ if !hasmapto('<Plug>VimwikiToggleRejectedListItem')
   nmap <silent><buffer> glx <Plug>VimwikiToggleRejectedListItem
   vmap <silent><buffer> glx <Plug>VimwikiToggleRejectedListItem
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
-vnoremap <silent><script><buffer>
-      \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
+vnoremap <silent><script><buffer> <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 nnoremap <silent><script><buffer>
       \ <Plug>VimwikiToggleRejectedListItem :VimwikiToggleRejectedListItem<CR>
 vnoremap <silent><script><buffer>
@@ -459,39 +450,31 @@ if !hasmapto('<Plug>VimwikiDecrementListItem')
   nmap <silent><buffer> glp <Plug>VimwikiDecrementListItem
   vmap <silent><buffer> glp <Plug>VimwikiDecrementListItem
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiIncrementListItem :VimwikiIncrementListItem<CR>
-vnoremap <silent><script><buffer>
-      \ <Plug>VimwikiIncrementListItem :VimwikiIncrementListItem<CR>
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiDecrementListItem :VimwikiDecrementListItem<CR>
-vnoremap <silent><script><buffer>
-      \ <Plug>VimwikiDecrementListItem :VimwikiDecrementListItem<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiIncrementListItem :VimwikiIncrementListItem<CR>
+vnoremap <silent><script><buffer> <Plug>VimwikiIncrementListItem :VimwikiIncrementListItem<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiDecrementListItem :VimwikiDecrementListItem<CR>
+vnoremap <silent><script><buffer> <Plug>VimwikiDecrementListItem :VimwikiDecrementListItem<CR>
 
 if !hasmapto('<Plug>VimwikiDecreaseLvlSingleItem', 'i')
-  imap <silent><buffer> <C-D>
-        \ <Plug>VimwikiDecreaseLvlSingleItem
+  imap <silent><buffer> <C-D> <Plug>VimwikiDecreaseLvlSingleItem
 endif
 inoremap <silent><script><buffer> <Plug>VimwikiDecreaseLvlSingleItem
     \ <C-O>:VimwikiListChangeLvl decrease 0<CR>
 
 if !hasmapto('<Plug>VimwikiIncreaseLvlSingleItem', 'i')
-  imap <silent><buffer> <C-T>
-        \ <Plug>VimwikiIncreaseLvlSingleItem
+  imap <silent><buffer> <C-T> <Plug>VimwikiIncreaseLvlSingleItem
 endif
 inoremap <silent><script><buffer> <Plug>VimwikiIncreaseLvlSingleItem
     \ <C-O>:VimwikiListChangeLvl increase 0<CR>
 
 if !hasmapto('<Plug>VimwikiListNextSymbol', 'i')
-  imap <silent><buffer> <C-L><C-J>
-        \ <Plug>VimwikiListNextSymbol
+  imap <silent><buffer> <C-L><C-J> <Plug>VimwikiListNextSymbol
 endif
 inoremap <silent><script><buffer> <Plug>VimwikiListNextSymbol
       \ <C-O>:VimwikiListChangeSymbolI next<CR>
 
 if !hasmapto('<Plug>VimwikiListPrevSymbol', 'i')
-  imap <silent><buffer> <C-L><C-K>
-        \ <Plug>VimwikiListPrevSymbol
+  imap <silent><buffer> <C-L><C-K> <Plug>VimwikiListPrevSymbol
 endif
 inoremap <silent><script><buffer> <Plug>VimwikiListPrevSymbol
       \ <C-O>:VimwikiListChangeSymbolI prev<CR>
@@ -507,15 +490,13 @@ nnoremap <silent> <buffer> O :<C-U>call vimwiki#lst#kbd_O()<CR>
 if !hasmapto('<Plug>VimwikiRenumberList')
   nmap <silent><buffer> glr <Plug>VimwikiRenumberList
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiRenumberList :VimwikiRenumberList<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiRenumberList :VimwikiRenumberList<CR>
 
 if !hasmapto('<Plug>VimwikiRenumberAllLists')
   nmap <silent><buffer> gLr <Plug>VimwikiRenumberAllLists
   nmap <silent><buffer> gLR <Plug>VimwikiRenumberAllLists
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiRenumberAllLists :VimwikiRenumberAllLists<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiRenumberAllLists :VimwikiRenumberAllLists<CR>
 
 if !hasmapto('<Plug>VimwikiDecreaseLvlSingleItem')
   map <silent><buffer> glh <Plug>VimwikiDecreaseLvlSingleItem
@@ -546,14 +527,12 @@ noremap <silent><script><buffer>
 if !hasmapto('<Plug>VimwikiRemoveSingleCB')
   map <silent><buffer> gl<Space> <Plug>VimwikiRemoveSingleCB
 endif
-noremap <silent><script><buffer>
-    \ <Plug>VimwikiRemoveSingleCB :VimwikiRemoveSingleCB<CR>
+noremap <silent><script><buffer> <Plug>VimwikiRemoveSingleCB :VimwikiRemoveSingleCB<CR>
 
 if !hasmapto('<Plug>VimwikiRemoveCBInList')
   map <silent><buffer> gL<Space> <Plug>VimwikiRemoveCBInList
 endif
-noremap <silent><script><buffer>
-    \ <Plug>VimwikiRemoveCBInList :VimwikiRemoveCBInList<CR>
+noremap <silent><script><buffer> <Plug>VimwikiRemoveCBInList :VimwikiRemoveCBInList<CR>
 
 for s:char in vimwiki#vars#get_syntaxlocal('bullet_types')
   if !hasmapto(':VimwikiChangeSymbolTo '.s:char.'<CR>')
@@ -574,8 +553,7 @@ for s:typ in vimwiki#vars#get_syntaxlocal('number_types')
 endfor
 
 
-
-function! s:CR(normal, just_mrkr) "{{{
+function! s:CR(normal, just_mrkr)
   if vimwiki#vars#get_global('table_mappings')
     let res = vimwiki#tbl#kbd_cr()
     if res != ""
@@ -585,7 +563,7 @@ function! s:CR(normal, just_mrkr) "{{{
     endif
   endif
   call vimwiki#lst#kbd_cr(a:normal, a:just_mrkr)
-endfunction "}}}
+endfunction
 
 if !hasmapto('VimwikiReturn', 'i')
   if maparg('<CR>', 'i') !~? '<Esc>:VimwikiReturn'
@@ -609,8 +587,7 @@ nnoremap <buffer> gww :VimwikiTableAlignW<CR>
 if !hasmapto('<Plug>VimwikiTableMoveColumnLeft')
   nmap <silent><buffer> <A-Left> <Plug>VimwikiTableMoveColumnLeft
 endif
-nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiTableMoveColumnLeft :VimwikiTableMoveColumnLeft<CR>
+nnoremap <silent><script><buffer> <Plug>VimwikiTableMoveColumnLeft :VimwikiTableMoveColumnLeft<CR>
 if !hasmapto('<Plug>VimwikiTableMoveColumnRight')
   nmap <silent><buffer> <A-Right> <Plug>VimwikiTableMoveColumnRight
 endif
@@ -619,7 +596,10 @@ nnoremap <silent><script><buffer>
 
 
 
-" Text objects {{{
+" ------------------------------------------------
+" Text objects
+" ------------------------------------------------
+
 onoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 0, v:count1)<CR>
 vnoremap <silent><buffer> ah :<C-U>call vimwiki#base#TO_header(0, 0, v:count1)<CR>
 
@@ -653,8 +633,7 @@ vnoremap <silent><buffer> il :<C-U>call vimwiki#lst#TO_list_item(1, 1)<CR>
 if !hasmapto('<Plug>VimwikiAddHeaderLevel')
   nmap <silent><buffer> = <Plug>VimwikiAddHeaderLevel
 endif
-nnoremap <silent><buffer> <Plug>VimwikiAddHeaderLevel :
-      \<C-U>call vimwiki#base#AddHeaderLevel()<CR>
+nnoremap <silent><buffer> <Plug>VimwikiAddHeaderLevel :<C-U>call vimwiki#base#AddHeaderLevel()<CR>
 
 if !hasmapto('<Plug>VimwikiRemoveHeaderLevel')
   nmap <silent><buffer> - <Plug>VimwikiRemoveHeaderLevel
@@ -693,11 +672,8 @@ endif
 nnoremap <silent><buffer> <Plug>VimwikiGoToPrevSiblingHeader :
       \<C-u>call vimwiki#base#goto_sibling(-1)<CR>
 
-" }}}
 
-" KEYBINDINGS }}}
 
-" AUTOCOMMANDS {{{
 if vimwiki#vars#get_wikilocal('auto_export')
   " Automatically generate HTML on page write.
   augroup vimwiki
@@ -720,10 +696,4 @@ if vimwiki#vars#get_wikilocal('auto_tags')
     au BufWritePost <buffer> call vimwiki#tags#update_tags(0, '')
   augroup END
 endif
-" AUTOCOMMANDS }}}
 
-" PASTE, CAT URL {{{
-" html commands
-command! -buffer VimwikiPasteUrl call vimwiki#html#PasteUrl(expand('%:p'))
-command! -buffer VimwikiCatUrl call vimwiki#html#CatUrl(expand('%:p'))
-" }}}
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index dc7b654..7baae51 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -1,19 +1,21 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki plugin file
 " Home: https://github.com/vimwiki/vimwiki/
 " GetLatestVimScripts: 2226 1 :AutoInstall: vimwiki
 
+
 if exists("g:loaded_vimwiki") || &cp
   finish
 endif
 let g:loaded_vimwiki = 1
 
+
 let s:old_cpo = &cpo
 set cpo&vim
 
 
 " this is called when the cursor leaves the buffer
-function! s:setup_buffer_leave() "{{{
+function! s:setup_buffer_leave()
   " don't do anything if it's not managed by Vimwiki (that is, when it's not in
   " a registered wiki and not a temporary wiki)
   if vimwiki#vars#get_bufferlocal('wiki_nr') == -1
@@ -25,7 +27,7 @@ function! s:setup_buffer_leave() "{{{
   if vimwiki#vars#get_global('menu') != ""
     exe 'nmenu disable '.vimwiki#vars#get_global('menu').'.Table'
   endif
-endfunction "}}}
+endfunction
 
 
 " create a new temporary wiki for the current buffer
@@ -52,7 +54,7 @@ endfunction
 " This function is called when Vim opens a new buffer with a known wiki
 " extension. Both when the buffer has never been opened in this session and
 " when it has.
-function! s:setup_new_wiki_buffer() "{{{
+function! s:setup_new_wiki_buffer()
   let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
   if wiki_nr == -1    " it's not in a known wiki directory
     if vimwiki#vars#get_global('global_ext')
@@ -73,11 +75,11 @@ function! s:setup_new_wiki_buffer() "{{{
   " sourced
   setfiletype vimwiki
 
-endfunction "}}}
+endfunction
 
 
 " this is called when the cursor enters the buffer
-function! s:setup_buffer_enter() "{{{
+function! s:setup_buffer_enter()
   " don't do anything if it's not managed by Vimwiki (that is, when it's not in
   " a registered wiki and not a temporary wiki)
   if vimwiki#vars#get_bufferlocal('wiki_nr') == -1
@@ -91,10 +93,11 @@ function! s:setup_buffer_enter() "{{{
   call s:set_global_options()
 
   call s:set_windowlocal_options()
-endfunction "}}}
+endfunction
 
 
-function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
+function! s:setup_cleared_syntax()
+  " highlight groups that get cleared
   " on colorscheme change because they are not linked to Vim-predefined groups
   hi def VimwikiBold term=bold cterm=bold gui=bold
   hi def VimwikiItalic term=italic cterm=italic gui=italic
@@ -108,10 +111,10 @@ function! s:setup_cleared_syntax() "{{{ highlight groups that get cleared
             \ .' term=bold cterm=bold'
     endfor
   endif
-endfunction "}}}
+endfunction
 
 
-function! s:vimwiki_get_known_extensions() " {{{
+function! s:vimwiki_get_known_extensions()
   " Getting all extensions that different wikis could have
   let extensions = {}
   for idx in range(vimwiki#vars#number_of_wikis())
@@ -123,7 +126,7 @@ function! s:vimwiki_get_known_extensions() " {{{
     let extensions[ext] = 1
   endfor
   return keys(extensions)
-endfunction " }}}
+endfunction
 
 
 " Set settings which are global for Vim, but should only be executed for
@@ -171,7 +174,7 @@ function! s:set_windowlocal_options()
   endif
 endfunction
 
-" }}}
+
 
 
 " Initialization of Vimwiki starts here. Make sure everything below does not
@@ -179,30 +182,30 @@ endfunction
 
 call vimwiki#vars#init()
 
-" CALLBACK functions "{{{
-" User can redefine it.
-if !exists("*VimwikiLinkHandler") "{{{
+
+" Define callback functions which the user can redefine
+if !exists("*VimwikiLinkHandler")
   function VimwikiLinkHandler(url)
     return 0
   endfunction
-endif "}}}
+endif
 
-if !exists("*VimwikiLinkConverter") "{{{
+if !exists("*VimwikiLinkConverter")
   function VimwikiLinkConverter(url, source, target)
     " Return the empty string when unable to process link
     return ''
   endfunction
-endif "}}}
+endif
 
-if !exists("*VimwikiWikiIncludeHandler") "{{{
-  function! VimwikiWikiIncludeHandler(value) "{{{
+if !exists("*VimwikiWikiIncludeHandler")
+  function! VimwikiWikiIncludeHandler(value)
     return ''
-  endfunction "}}}
-endif "}}}
-" CALLBACK }}}
+  endfunction
+endif
 
 
-" AUTOCOMMANDS for all known wiki extensions {{{
+
+" Define autocommands for all known wiki extensions
 
 let s:known_extensions = s:vimwiki_get_known_extensions()
 
@@ -228,9 +231,9 @@ augroup vimwiki
     endif
   endfor
 augroup END
-"}}}
 
-" COMMANDS {{{
+
+
 command! VimwikiUISelect call vimwiki#base#ui_select()
 " why not using <count> instead of v:count1?
 " See https://github.com/vimwiki-backup/vimwiki/issues/324
@@ -246,15 +249,17 @@ command! -count=1 VimwikiMakeDiaryNote
 command! -count=1 VimwikiTabMakeDiaryNote
       \ call vimwiki#diary#make_note(v:count1, 1)
 command! -count=1 VimwikiMakeYesterdayDiaryNote
-      \ call vimwiki#diary#make_note(v:count1, 0, vimwiki#diary#diary_date_link(localtime() - 60*60*24))
+      \ call vimwiki#diary#make_note(v:count1, 0,
+      \ vimwiki#diary#diary_date_link(localtime() - 60*60*24))
 command! -count=1 VimwikiMakeTomorrowDiaryNote
-      \ call vimwiki#diary#make_note(v:count1, 0, vimwiki#diary#diary_date_link(localtime() + 60*60*24))
+      \ call vimwiki#diary#make_note(v:count1, 0,
+      \ vimwiki#diary#diary_date_link(localtime() + 60*60*24))
 
 command! VimwikiDiaryGenerateLinks
       \ call vimwiki#diary#generate_diary_section()
-"}}}
 
-" MAPPINGS {{{
+
+
 let s:map_prefix = vimwiki#vars#get_global('map_prefix')
 
 if !hasmapto('<Plug>VimwikiIndex')
@@ -305,9 +310,9 @@ endif
 nnoremap <unique><script> <Plug>VimwikiMakeTomorrowDiaryNote
       \ :VimwikiMakeTomorrowDiaryNote<CR>
 
-"}}}
 
-" MENU {{{
+
+
 function! s:build_menu(topmenu)
   for idx in range(vimwiki#vars#number_of_wikis())
     let norm_path = fnamemodify(vimwiki#vars#get_wikilocal('path', idx), ':h:t')
@@ -324,7 +329,8 @@ function! s:build_table_menu(topmenu)
   exe 'menu '.a:topmenu.'.Table.Create\ (enter\ cols\ rows) :VimwikiTable '
   exe 'nmenu '.a:topmenu.'.Table.Format<tab>gqq gqq'
   exe 'nmenu '.a:topmenu.'.Table.Move\ column\ left<tab><A-Left> :VimwikiTableMoveColumnLeft<CR>'
-  exe 'nmenu '.a:topmenu.'.Table.Move\ column\ right<tab><A-Right> :VimwikiTableMoveColumnRight<CR>'
+  exe 'nmenu '.a:topmenu.
+        \ '.Table.Move\ column\ right<tab><A-Right> :VimwikiTableMoveColumnRight<CR>'
   exe 'nmenu disable '.a:topmenu.'.Table'
 endfunction
 
@@ -333,14 +339,13 @@ if !empty(vimwiki#vars#get_global('menu'))
   call s:build_menu(vimwiki#vars#get_global('menu'))
   call s:build_table_menu(vimwiki#vars#get_global('menu'))
 endif
-" }}}
 
-" CALENDAR Hook "{{{
+
+" Hook for calendar.vim
 if vimwiki#vars#get_global('use_calendar')
   let g:calendar_action = 'vimwiki#diary#calendar_action'
   let g:calendar_sign = 'vimwiki#diary#calendar_sign'
 endif
-"}}}
 
 
 let &cpo = s:old_cpo
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 69b83c5..15f0a9e 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -1,7 +1,8 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki syntax file
 " Home: https://github.com/vimwiki/vimwiki/
 
+
 " Quit if syntax file is already loaded
 if v:version < 600
   syntax clear
@@ -12,35 +13,38 @@ endif
 
 let s:current_syntax = vimwiki#vars#get_wikilocal('syntax')
 
+
 call vimwiki#vars#populate_syntax_vars(s:current_syntax)
 
 
-" LINKS: highlighting is complicated due to "nonexistent" links feature {{{
-function! s:add_target_syntax_ON(target, type) " {{{
+" LINKS: highlighting is complicated due to "nonexistent" links feature
+function! s:add_target_syntax_ON(target, type)
   let prefix0 = 'syntax match '.a:type.' `'
   let suffix0 = '` display contains=@NoSpell,VimwikiLinkRest,'.a:type.'Char'
   let prefix1 = 'syntax match '.a:type.'T `'
   let suffix1 = '` display contained'
   execute prefix0. a:target. suffix0
   execute prefix1. a:target. suffix1
-endfunction "}}}
+endfunction
 
-function! s:add_target_syntax_OFF(target) " {{{
+
+function! s:add_target_syntax_OFF(target)
   let prefix0 = 'syntax match VimwikiNoExistsLink `'
   let suffix0 = '` display contains=@NoSpell,VimwikiLinkRest,VimwikiLinkChar'
   let prefix1 = 'syntax match VimwikiNoExistsLinkT `'
   let suffix1 = '` display contained'
   execute prefix0. a:target. suffix0
   execute prefix1. a:target. suffix1
-endfunction "}}}
+endfunction
 
-function! s:highlight_existing_links() "{{{
+
+function! s:highlight_existing_links()
   " Wikilink
   " Conditional highlighting that depends on the existence of a wiki file or
   "   directory is only available for *schemeless* wiki links
   " Links are set up upon BufEnter (see plugin/...)
-  let safe_links = '\%('.vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikifiles')) .
-        \ '\%(#[^|]*\)\?\|#[^|]*\)'
+  let safe_links = '\%('.vimwiki#base#file_pattern(
+        \ vimwiki#vars#get_bufferlocal('existing_wikifiles')) . '\%(#[^|]*\)\?\|#[^|]*\)'
   " Wikilink Dirs set up upon BufEnter (see plugin/...)
   let safe_dirs = vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikidirs'))
 
@@ -75,7 +79,7 @@ function! s:highlight_existing_links() "{{{
         \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate2')),
         \ safe_dirs, vimwiki#vars#get_global('rxWikiLinkDescr'), '')
   call s:add_target_syntax_ON(target, 'VimwikiLink')
-endfunction "}}}
+endfunction
 
 
 " use max highlighting - could be quite slow if there are too many wikifiles
@@ -94,9 +98,11 @@ else
   call s:add_target_syntax_ON(vimwiki#vars#get_global('rxWikiIncl'), 'VimwikiLink')
 endif
 
+
 " Weblink
 call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWeblink'), 'VimwikiLink')
 
+
 " WikiLink
 " All remaining schemes are highlighted automatically
 let s:rxSchemes = '\%('.
@@ -107,64 +113,73 @@ let s:rxSchemes = '\%('.
 " a) match [[nonwiki-scheme-URL]]
 let s:target = vimwiki#base#apply_template(
       \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate1')),
-      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiLinkUrl'), vimwiki#vars#get_global('rxWikiLinkDescr'), '')
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiLinkUrl'),
+      \ vimwiki#vars#get_global('rxWikiLinkDescr'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 " b) match [[nonwiki-scheme-URL|DESCRIPTION]]
 let s:target = vimwiki#base#apply_template(
       \ vimwiki#u#escape(vimwiki#vars#get_global('WikiLinkTemplate2')),
-      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiLinkUrl'), vimwiki#vars#get_global('rxWikiLinkDescr'), '')
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiLinkUrl'),
+      \ vimwiki#vars#get_global('rxWikiLinkDescr'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 
 " a) match {{nonwiki-scheme-URL}}
 let s:target = vimwiki#base#apply_template(
       \ vimwiki#u#escape(vimwiki#vars#get_global('WikiInclTemplate1')),
-      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiInclUrl'), vimwiki#vars#get_global('rxWikiInclArgs'), '')
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiInclUrl'),
+      \ vimwiki#vars#get_global('rxWikiInclArgs'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 " b) match {{nonwiki-scheme-URL}[{...}]}
 let s:target = vimwiki#base#apply_template(
       \ vimwiki#u#escape(vimwiki#vars#get_global('WikiInclTemplate2')),
-      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiInclUrl'), vimwiki#vars#get_global('rxWikiInclArgs'), '')
+      \ s:rxSchemes.vimwiki#vars#get_global('rxWikiInclUrl'),
+      \ vimwiki#vars#get_global('rxWikiInclArgs'), '')
 call s:add_target_syntax_ON(s:target, 'VimwikiLink')
 
-" }}}
 
-" generic headers "{{{
 
 " Header levels, 1-6
 for s:i in range(1,6)
   execute 'syntax match VimwikiHeader'.s:i
-      \ . ' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i, s:current_syntax).'/'
-      \ . ' contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,@Spell'
-  execute 'syntax region VimwikiH'.s:i.'Folding'
-        \ . ' start=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_Start', s:current_syntax).'/'
-        \ . ' end=/'.vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_End', s:current_syntax).'/me=s-1 transparent fold'
+      \ . ' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i, s:current_syntax).
+      \ '/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,'.
+      \ 'VimwikiLink,@Spell'
+  execute 'syntax region VimwikiH'.s:i.'Folding start=/'.
+        \ vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_Start', s:current_syntax).'/ end=/'.
+        \ vimwiki#vars#get_syntaxlocal('rxH'.s:i.'_End', s:current_syntax).
+        \ '/me=s-1 transparent fold'
 endfor
 
 
-" }}}
 
-
-" possibly concealed chars " {{{
+" possibly concealed chars
 let s:conceal = exists("+conceallevel") ? ' conceal' : ''
 
-execute 'syn match VimwikiEqInChar contained /'.vimwiki#vars#get_syntaxlocal('char_eqin').'/'.s:conceal
-execute 'syn match VimwikiBoldChar contained /'.vimwiki#vars#get_syntaxlocal('char_bold').'/'.s:conceal
-execute 'syn match VimwikiItalicChar contained /'.vimwiki#vars#get_syntaxlocal('char_italic').'/'.s:conceal
-execute 'syn match VimwikiBoldItalicChar contained /'.vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'.s:conceal
-execute 'syn match VimwikiItalicBoldChar contained /'.vimwiki#vars#get_syntaxlocal('char_italicbold').'/'.s:conceal
-execute 'syn match VimwikiCodeChar contained /'.vimwiki#vars#get_syntaxlocal('char_code').'/'.s:conceal
-execute 'syn match VimwikiDelTextChar contained /'.vimwiki#vars#get_syntaxlocal('char_deltext').'/'.s:conceal
-execute 'syn match VimwikiSuperScript contained /'.vimwiki#vars#get_syntaxlocal('char_superscript').'/'.s:conceal
-execute 'syn match VimwikiSubScript contained /'.vimwiki#vars#get_syntaxlocal('char_subscript').'/'.s:conceal
-" }}}
+execute 'syn match VimwikiEqInChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_eqin').'/'.s:conceal
+execute 'syn match VimwikiBoldChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_bold').'/'.s:conceal
+execute 'syn match VimwikiItalicChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_italic').'/'.s:conceal
+execute 'syn match VimwikiBoldItalicChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'.s:conceal
+execute 'syn match VimwikiItalicBoldChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_italicbold').'/'.s:conceal
+execute 'syn match VimwikiCodeChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_code').'/'.s:conceal
+execute 'syn match VimwikiDelTextChar contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_deltext').'/'.s:conceal
+execute 'syn match VimwikiSuperScript contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_superscript').'/'.s:conceal
+execute 'syn match VimwikiSubScript contained /'.
+      \ vimwiki#vars#get_syntaxlocal('char_subscript').'/'.s:conceal
+
+
 
-" concealed link parts " {{{
 
-" define the conceal attribute for links only if Vim is new enough to handle it
-" and the user has g:vimwiki_url_maxsave > 0
 
 let s:options = ' contained transparent contains=NONE'
-"
+
 " A shortener for long URLs: LinkRest (a middle part of the URL) is concealed
 " VimwikiLinkRest group is left undefined if link shortening is not desired
 if exists("+conceallevel") && vimwiki#vars#get_global('url_maxsave') > 0
@@ -187,27 +202,37 @@ execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclPrefix'
 execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclSuffix').'/'.s:options
 execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclPrefix1').'/'.s:options
 execute 'syn match VimwikiLinkChar /'.vimwiki#vars#get_global('rxWikiInclSuffix1').'/'.s:options
-" }}}
 
-" non concealed chars " {{{
-execute 'syn match VimwikiHeaderChar contained /\%(^\s*'.vimwiki#vars#get_syntaxlocal('rxH').'\+\)\|\%('.vimwiki#vars#get_syntaxlocal('rxH').'\+\s*$\)/'
-execute 'syn match VimwikiEqInCharT contained /'.vimwiki#vars#get_syntaxlocal('char_eqin').'/'
-execute 'syn match VimwikiBoldCharT contained /'.vimwiki#vars#get_syntaxlocal('char_bold').'/'
-execute 'syn match VimwikiItalicCharT contained /'.vimwiki#vars#get_syntaxlocal('char_italic').'/'
-execute 'syn match VimwikiBoldItalicCharT contained /'.vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'
-execute 'syn match VimwikiItalicBoldCharT contained /'.vimwiki#vars#get_syntaxlocal('char_italicbold').'/'
-execute 'syn match VimwikiCodeCharT contained /'.vimwiki#vars#get_syntaxlocal('char_code').'/'
-execute 'syn match VimwikiDelTextCharT contained /'.vimwiki#vars#get_syntaxlocal('char_deltext').'/'
-execute 'syn match VimwikiSuperScriptT contained /'.vimwiki#vars#get_syntaxlocal('char_superscript').'/'
-execute 'syn match VimwikiSubScriptT contained /'.vimwiki#vars#get_syntaxlocal('char_subscript').'/'
+
+" non concealed chars
+execute 'syn match VimwikiHeaderChar contained /\%(^\s*'.
+      \ vimwiki#vars#get_syntaxlocal('rxH').'\+\)\|\%('.vimwiki#vars#get_syntaxlocal('rxH').
+      \ '\+\s*$\)/'
+execute 'syn match VimwikiEqInCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_eqin').'/'
+execute 'syn match VimwikiBoldCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_bold').'/'
+execute 'syn match VimwikiItalicCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_italic').'/'
+execute 'syn match VimwikiBoldItalicCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'
+execute 'syn match VimwikiItalicBoldCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_italicbold').'/'
+execute 'syn match VimwikiCodeCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_code').'/'
+execute 'syn match VimwikiDelTextCharT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_deltext').'/'
+execute 'syn match VimwikiSuperScriptT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_superscript').'/'
+execute 'syn match VimwikiSubScriptT contained /'
+      \ .vimwiki#vars#get_syntaxlocal('char_subscript').'/'
 
 " Emoticons
 "syntax match VimwikiEmoticons /\%((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
 
 execute 'syntax match VimwikiTodo /'. vimwiki#vars#get_global('rxTodo') .'/'
-" }}}
 
-" main syntax groups {{{
+
 
 " Tables
 syntax match VimwikiTableRow /^\s*|.\+|\s*$/ 
@@ -229,6 +254,7 @@ syntax match VimwikiTableRow /^\s*|.\+|\s*$/
 syntax match VimwikiCellSeparator 
       \ /\%(|\)\|\%(-\@<=+\-\@=\)\|\%([|+]\@<=-\+\)/ contained
 
+
 " Lists
 execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListItemWithoutCB').'/'
 execute 'syntax match VimwikiList /'.vimwiki#vars#get_syntaxlocal('rxListDefine').'/'
@@ -246,32 +272,51 @@ elseif vimwiki#vars#get_global('hl_cb_checked') == 2
 endif
 
 
-execute 'syntax match VimwikiEqIn /'.vimwiki#vars#get_syntaxlocal('rxEqIn').'/ contains=VimwikiEqInChar'
-execute 'syntax match VimwikiEqInT /'.vimwiki#vars#get_syntaxlocal('rxEqIn').'/ contained contains=VimwikiEqInCharT'
+execute 'syntax match VimwikiEqIn /'.vimwiki#vars#get_syntaxlocal('rxEqIn').
+      \ '/ contains=VimwikiEqInChar'
+execute 'syntax match VimwikiEqInT /'.vimwiki#vars#get_syntaxlocal('rxEqIn').
+      \ '/ contained contains=VimwikiEqInCharT'
 
-execute 'syntax match VimwikiBold /'.vimwiki#vars#get_syntaxlocal('rxBold').'/ contains=VimwikiBoldChar,@Spell'
-execute 'syntax match VimwikiBoldT /'.vimwiki#vars#get_syntaxlocal('rxBold').'/ contained contains=VimwikiBoldCharT,@Spell'
+execute 'syntax match VimwikiBold /'.vimwiki#vars#get_syntaxlocal('rxBold').
+      \ '/ contains=VimwikiBoldChar,@Spell'
+execute 'syntax match VimwikiBoldT /'.vimwiki#vars#get_syntaxlocal('rxBold').
+      \ '/ contained contains=VimwikiBoldCharT,@Spell'
 
-execute 'syntax match VimwikiItalic /'.vimwiki#vars#get_syntaxlocal('rxItalic').'/ contains=VimwikiItalicChar,@Spell'
-execute 'syntax match VimwikiItalicT /'.vimwiki#vars#get_syntaxlocal('rxItalic').'/ contained contains=VimwikiItalicCharT,@Spell'
+execute 'syntax match VimwikiItalic /'.vimwiki#vars#get_syntaxlocal('rxItalic').
+      \ '/ contains=VimwikiItalicChar,@Spell'
+execute 'syntax match VimwikiItalicT /'.vimwiki#vars#get_syntaxlocal('rxItalic').
+      \ '/ contained contains=VimwikiItalicCharT,@Spell'
 
-execute 'syntax match VimwikiBoldItalic /'.vimwiki#vars#get_syntaxlocal('rxBoldItalic').'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
-execute 'syntax match VimwikiBoldItalicT /'.vimwiki#vars#get_syntaxlocal('rxBoldItalic').'/ contained contains=VimwikiBoldItalicChatT,VimwikiItalicBoldCharT,@Spell'
+execute 'syntax match VimwikiBoldItalic /'.vimwiki#vars#get_syntaxlocal('rxBoldItalic').
+      \ '/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
+execute 'syntax match VimwikiBoldItalicT /'.vimwiki#vars#get_syntaxlocal('rxBoldItalic').
+      \ '/ contained contains=VimwikiBoldItalicChatT,VimwikiItalicBoldCharT,@Spell'
 
-execute 'syntax match VimwikiItalicBold /'.vimwiki#vars#get_syntaxlocal('rxItalicBold').'/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
-execute 'syntax match VimwikiItalicBoldT /'.vimwiki#vars#get_syntaxlocal('rxItalicBold').'/ contained contains=VimwikiBoldItalicCharT,VimsikiItalicBoldCharT,@Spell'
+execute 'syntax match VimwikiItalicBold /'.vimwiki#vars#get_syntaxlocal('rxItalicBold').
+      \ '/ contains=VimwikiBoldItalicChar,VimwikiItalicBoldChar,@Spell'
+execute 'syntax match VimwikiItalicBoldT /'.vimwiki#vars#get_syntaxlocal('rxItalicBold').
+      \ '/ contained contains=VimwikiBoldItalicCharT,VimsikiItalicBoldCharT,@Spell'
 
-execute 'syntax match VimwikiDelText /'.vimwiki#vars#get_syntaxlocal('rxDelText').'/ contains=VimwikiDelTextChar,@Spell'
-execute 'syntax match VimwikiDelTextT /'.vimwiki#vars#get_syntaxlocal('rxDelText').'/ contained contains=VimwikiDelTextChar,@Spell'
+execute 'syntax match VimwikiDelText /'.vimwiki#vars#get_syntaxlocal('rxDelText').
+      \ '/ contains=VimwikiDelTextChar,@Spell'
+execute 'syntax match VimwikiDelTextT /'.vimwiki#vars#get_syntaxlocal('rxDelText').
+      \ '/ contained contains=VimwikiDelTextChar,@Spell'
 
-execute 'syntax match VimwikiSuperScript /'.vimwiki#vars#get_syntaxlocal('rxSuperScript').'/ contains=VimwikiSuperScriptChar,@Spell'
-execute 'syntax match VimwikiSuperScriptT /'.vimwiki#vars#get_syntaxlocal('rxSuperScript').'/ contained contains=VimwikiSuperScriptCharT,@Spell'
+execute 'syntax match VimwikiSuperScript /'.vimwiki#vars#get_syntaxlocal('rxSuperScript').
+      \ '/ contains=VimwikiSuperScriptChar,@Spell'
+execute 'syntax match VimwikiSuperScriptT /'.vimwiki#vars#get_syntaxlocal('rxSuperScript').
+      \ '/ contained contains=VimwikiSuperScriptCharT,@Spell'
 
-execute 'syntax match VimwikiSubScript /'.vimwiki#vars#get_syntaxlocal('rxSubScript').'/ contains=VimwikiSubScriptChar,@Spell'
-execute 'syntax match VimwikiSubScriptT /'.vimwiki#vars#get_syntaxlocal('rxSubScript').'/ contained contains=VimwikiSubScriptCharT,@Spell'
+execute 'syntax match VimwikiSubScript /'.vimwiki#vars#get_syntaxlocal('rxSubScript').
+      \ '/ contains=VimwikiSubScriptChar,@Spell'
+execute 'syntax match VimwikiSubScriptT /'.vimwiki#vars#get_syntaxlocal('rxSubScript').
+      \ '/ contained contains=VimwikiSubScriptCharT,@Spell'
+
+execute 'syntax match VimwikiCode /'.vimwiki#vars#get_syntaxlocal('rxCode').
+      \ '/ contains=VimwikiCodeChar'
+execute 'syntax match VimwikiCodeT /'.vimwiki#vars#get_syntaxlocal('rxCode').
+      \ '/ contained contains=VimwikiCodeCharT'
 
-execute 'syntax match VimwikiCode /'.vimwiki#vars#get_syntaxlocal('rxCode').'/ contains=VimwikiCodeChar'
-execute 'syntax match VimwikiCodeT /'.vimwiki#vars#get_syntaxlocal('rxCode').'/ contained contains=VimwikiCodeCharT'
 
 " <hr> horizontal rule
 execute 'syntax match VimwikiHR /'.vimwiki#vars#get_syntaxlocal('rxHR').'/'
@@ -285,11 +330,15 @@ execute 'syntax region VimwikiMath start=/'.vimwiki#vars#get_syntaxlocal('rxMath
 
 " placeholders
 syntax match VimwikiPlaceholder /^\s*%nohtml\s*$/
-syntax match VimwikiPlaceholder /^\s*%title\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
-syntax match VimwikiPlaceholder /^\s*%date\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
-syntax match VimwikiPlaceholder /^\s*%template\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
+syntax match VimwikiPlaceholder
+      \ /^\s*%title\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
+syntax match VimwikiPlaceholder
+      \ /^\s*%date\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
+syntax match VimwikiPlaceholder
+      \ /^\s*%template\ze\%(\s.*\)\?$/ nextgroup=VimwikiPlaceholderParam skipwhite
 syntax match VimwikiPlaceholderParam /.*/ contained
 
+
 " html tags
 if vimwiki#vars#get_global('valid_html_tags') != ''
   let s:html_tags = join(split(vimwiki#vars#get_global('valid_html_tags'), '\s*,\s*'), '\|')
@@ -298,16 +347,16 @@ if vimwiki#vars#get_global('valid_html_tags') != ''
   execute 'syntax match VimwikiItalic #\c<i>.\{-}</i># contains=VimwikiHTMLTag'
   execute 'syntax match VimwikiUnderline #\c<u>.\{-}</u># contains=VimwikiHTMLTag'
 
-  execute 'syntax match VimwikiComment /'.vimwiki#vars#get_syntaxlocal('rxComment').'/ contains=@Spell,VimwikiTodo'
+  execute 'syntax match VimwikiComment /'.vimwiki#vars#get_syntaxlocal('rxComment').
+        \ '/ contains=@Spell,VimwikiTodo'
 endif
 
 " tags
 execute 'syntax match VimwikiTag /'.vimwiki#vars#get_syntaxlocal('rxTags').'/'
 
-" }}}
 
-" header groups highlighting "{{{
 
+" header groups highlighting
 if vimwiki#vars#get_global('hl_headers') == 0
   " Strangely in default colorscheme Title group is not set to bold for cterm...
   if !exists("g:colors_name")
@@ -323,9 +372,8 @@ else
           \ .vimwiki#vars#get_global('hcolor_ctermfg_'.&bg)[s:i-1].' term=bold cterm=bold'
   endfor
 endif
-"}}}
 
-" syntax group highlighting "{{{ 
+
 
 hi def link VimwikiMarkers Normal
 
@@ -407,15 +455,17 @@ hi def link VimwikiCodeCharT VimwikiMarkers
 hi def link VimwikiHeaderCharT VimwikiMarkers
 hi def link VimwikiLinkCharT VimwikiLinkT
 hi def link VimwikiNoExistsLinkCharT VimwikiNoExistsLinkT
-"}}}
+
 
 " Load syntax-specific functionality
 call vimwiki#u#reload_regexes_custom()
 
+
 " FIXME it now does not make sense to pretend there is a single syntax "vimwiki"
 let b:current_syntax="vimwiki"
 
-" EMBEDDED syntax setup "{{{
+
+" EMBEDDED syntax setup
 let s:nested = vimwiki#vars#get_wikilocal('nested_syntaxes')
 if vimwiki#vars#get_wikilocal('automatic_nested_syntaxes')
   let s:nested = extend(s:nested, vimwiki#base#detect_nested_syntax(), "keep")
@@ -428,12 +478,14 @@ if !empty(s:nested)
           \ vimwiki#vars#get_syntaxlocal('rxPreEnd'), 'VimwikiPre')
   endfor
 endif
+
+
 " LaTeX
 call vimwiki#base#nested_syntax('tex', 
       \ vimwiki#vars#get_syntaxlocal('rxMathStart').'\%(.*[[:blank:][:punct:]]\)\?'.
       \ '\%([[:blank:][:punct:]].*\)\?',
       \ vimwiki#vars#get_syntaxlocal('rxMathEnd'), 'VimwikiMath')
-"}}}
 
 
 syntax spell toplevel
+
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
index 99bead3..1fcbdec 100644
--- a/syntax/vimwiki_default.vim
+++ b/syntax/vimwiki_default.vim
@@ -1,13 +1,16 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki syntax file
-" Desc: Defines default syntax
+" Description: Defines default syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
+
 " s:default_syntax is kind of a reference to the dict in
 " g:vimwiki_syntax_variables['default']. It is used here simply as an
 " abbreviation for the latter.
 let s:default_syntax = g:vimwiki_syntax_variables['default']
 
+
+
 " text: $ equation_inline $
 let s:default_syntax.rxEqIn = '\$[^$`]\+\$'
 let s:default_syntax.char_eqin = '\$'
@@ -97,8 +100,11 @@ let s:default_syntax.rxTags = '\%(^\|\s\)\@<=:\%([^:''[:space:]]\+:\)\+\%(\s\|$\
 
 let s:default_syntax.header_search = '^\s*\(=\{1,6}\)\([^=].*[^=]\)\1\s*$'
 let s:default_syntax.header_match = '^\s*\(=\{1,6}\)=\@!\s*__Header__\s*\1=\@!\s*$'
-let s:default_syntax.bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
-let s:default_syntax.bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*\%([[:punct:]]\|\s\|$\)\@='
+let s:default_syntax.bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*'.
+      \ '[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
+let s:default_syntax.bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*'.
+      \ '\%([[:punct:]]\|\s\|$\)\@='
 let s:default_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]'
 let s:default_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)'
-let s:default_syntax.tag_match =  '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)'
+let s:default_syntax.tag_match =  '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:'.
+      \ '\([^:[:space:]]\+:\)*\(\s\|$\)'
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 4242f82..5962699 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -1,10 +1,12 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki syntax file
-" Desc: Defines markdown syntax
+" Description: Defines markdown syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
+
 " see the comments in vimwiki_default.vim for some info about this file
 
+
 let s:markdown_syntax = g:vimwiki_syntax_variables['markdown']
 
 " text: $ equation_inline $
@@ -92,8 +94,11 @@ let s:markdown_syntax.rxTags = '\%(^\|\s\)\@<=:\%([^:[:space:]]\+:\)\+\%(\s\|$\)
 
 let s:markdown_syntax.header_search = '^\s*\(#\{1,6}\)\([^#].*\)$'
 let s:markdown_syntax.header_match = '^\s*\(#\{1,6}\)#\@!\s*__Header__\s*$'
-let s:markdown_syntax.bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
-let s:markdown_syntax.bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*\%([[:punct:]]\|\s\|$\)\@='
-let s:markdown_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]' "XXX plus markdown-style links
+let s:markdown_syntax.bold_search = '\%(^\|\s\|[[:punct:]]\)\@<=\*\zs'.
+      \ '\%([^*`[:space:]][^*`]*[^*`[:space:]]\|[^*`[:space:]]\)\ze\*\%([[:punct:]]\|\s\|$\)\@='
+let s:markdown_syntax.bold_match = '\%(^\|\s\|[[:punct:]]\)\@<=\*__Text__\*'.
+      \ '\%([[:punct:]]\|\s\|$\)\@='
+let s:markdown_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]'
 let s:markdown_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)'
-let s:markdown_syntax.tag_match = '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)'
+let s:markdown_syntax.tag_match = '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:'.
+      \ '\([^:[:space:]]\+:\)*\(\s\|$\)'
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index 4f19b24..9ecf924 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -4,41 +4,44 @@
 
 
 
-
-" LINKS: highlighting is complicated due to "nonexistent" links feature {{{
-function! s:add_target_syntax_ON(target, type) " {{{
+function! s:add_target_syntax_ON(target, type)
   let prefix0 = 'syntax match '.a:type.' `'
   let suffix0 = '` display contains=@NoSpell,VimwikiLinkRest,'.a:type.'Char'
   let prefix1 = 'syntax match '.a:type.'T `'
   let suffix1 = '` display contained'
   execute prefix0. a:target. suffix0
   execute prefix1. a:target. suffix1
-endfunction "}}}
+endfunction
 
-function! s:add_target_syntax_OFF(target, type) " {{{
+
+function! s:add_target_syntax_OFF(target, type)
   let prefix0 = 'syntax match VimwikiNoExistsLink `'
   let suffix0 = '` display contains=@NoSpell,VimwikiLinkRest,'.a:type.'Char'
   let prefix1 = 'syntax match VimwikiNoExistsLinkT `'
   let suffix1 = '` display contained'
   execute prefix0. a:target. suffix0
   execute prefix1. a:target. suffix1
-endfunction "}}}
+endfunction
 
-function! s:wrap_wikilink1_rx(target) "{{{
+
+function! s:wrap_wikilink1_rx(target)
   return vimwiki#vars#get_syntaxlocal('rxWikiLink1InvalidPrefix') . a:target.
         \ vimwiki#vars#get_syntaxlocal('rxWikiLink1InvalidSuffix')
-endfunction "}}}
+endfunction
 
-function! s:existing_mkd_refs() "{{{
+
+function! s:existing_mkd_refs()
   return keys(vimwiki#markdown_base#scan_reflinks())
-endfunction "}}}
+endfunction
 
-function! s:highlight_existing_links() "{{{
+
+function! s:highlight_existing_links()
   " Wikilink1
   " Conditional highlighting that depends on the existence of a wiki file or
   "   directory is only available for *schemeless* wiki links
   " Links are set up upon BufEnter (see plugin/...)
-  let safe_links = '\%('.vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikifiles')) .
+  let safe_links = '\%('.
+        \ vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikifiles')) .
         \ '\%(#[^|]*\)\?\|#[^|]*\)'
   " Wikilink1 Dirs set up upon BufEnter (see plugin/...)
   let safe_dirs = vimwiki#base#file_pattern(vimwiki#vars#get_bufferlocal('existing_wikidirs'))
@@ -78,7 +81,7 @@ function! s:highlight_existing_links() "{{{
         \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template2')),
         \ safe_reflinks, vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
   call s:add_target_syntax_ON(s:wrap_wikilink1_rx(target), 'VimwikiWikiLink1')
-endfunction "}}}
+endfunction
 
 
 " use max highlighting - could be quite slow if there are too many wikifiles
@@ -93,9 +96,11 @@ else
   call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWikiLink1'), 'VimwikiWikiLink1')
 endif
 
+
 " Weblink
 call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWeblink1'), 'VimwikiWeblink1')
 
+
 " WikiLink
 " All remaining schemes are highlighted automatically
 let s:rxSchemes = '\%('.
@@ -106,26 +111,28 @@ let s:rxSchemes = '\%('.
 " a) match [nonwiki-scheme-URL]
 let s:target = vimwiki#base#apply_template(
       \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template1')),
-      \ s:rxSchemes . vimwiki#vars#get_syntaxlocal('rxWikiLink1Url'), vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
+      \ s:rxSchemes . vimwiki#vars#get_syntaxlocal('rxWikiLink1Url'),
+      \ vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
 call s:add_target_syntax_ON(s:wrap_wikilink1_rx(s:target), 'VimwikiWikiLink1')
 " b) match [DESCRIPTION][nonwiki-scheme-URL]
 let s:target = vimwiki#base#apply_template(
       \ vimwiki#u#escape(vimwiki#vars#get_syntaxlocal('WikiLink1Template2')),
-      \ s:rxSchemes . vimwiki#vars#get_syntaxlocal('rxWikiLink1Url'), vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
+      \ s:rxSchemes . vimwiki#vars#get_syntaxlocal('rxWikiLink1Url'),
+      \ vimwiki#vars#get_syntaxlocal('rxWikiLink1Descr'), '')
 call s:add_target_syntax_ON(s:wrap_wikilink1_rx(s:target), 'VimwikiWikiLink1')
-" }}}
 
 
-" generic headers "{{{
 
 " Header levels, 1-6
 for s:i in range(1,6)
-  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i).'/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
+  execute 'syntax match VimwikiHeader'.s:i.' /'.vimwiki#vars#get_syntaxlocal('rxH'.s:i).
+              \ '/ contains=VimwikiTodo,VimwikiHeaderChar,VimwikiNoExistsLink,VimwikiCode,'.
+              \ 'VimwikiLink,VimwikiWeblink1,VimwikiWikiLink1,@Spell'
 endfor
 
-" }}}
 
-" concealed chars " {{{
+
+" concealed chars
 if exists("+conceallevel")
   syntax conceal on
 endif
@@ -136,24 +143,26 @@ syntax spell toplevel
 " is present) and may be concealed
 let s:options = ' contained transparent contains=NONE'
 " conceal wikilink1
-execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rx_wikilink_md_prefix').'/'.s:options
-execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rx_wikilink_md_suffix').'/'.s:options
-execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rxWikiLink1Prefix1').'/'.s:options
-execute 'syn match VimwikiWikiLink1Char /'.vimwiki#vars#get_syntaxlocal('rxWikiLink1Suffix1').'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.
+            \ vimwiki#vars#get_syntaxlocal('rx_wikilink_md_prefix').'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.
+            \ vimwiki#vars#get_syntaxlocal('rx_wikilink_md_suffix').'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.
+            \ vimwiki#vars#get_syntaxlocal('rxWikiLink1Prefix1').'/'.s:options
+execute 'syn match VimwikiWikiLink1Char /'.
+            \ vimwiki#vars#get_syntaxlocal('rxWikiLink1Suffix1').'/'.s:options
 
 " conceal weblink1
-execute 'syn match VimwikiWeblink1Char "'.vimwiki#vars#get_syntaxlocal('rxWeblink1Prefix1').'"'.s:options
-execute 'syn match VimwikiWeblink1Char "'.vimwiki#vars#get_syntaxlocal('rxWeblink1Suffix1').'"'.s:options
+execute 'syn match VimwikiWeblink1Char "'.
+            \ vimwiki#vars#get_syntaxlocal('rxWeblink1Prefix1').'"'.s:options
+execute 'syn match VimwikiWeblink1Char "'.
+            \ vimwiki#vars#get_syntaxlocal('rxWeblink1Suffix1').'"'.s:options
 
 if exists("+conceallevel")
   syntax conceal off
 endif
-" }}}
 
-" non concealed chars " {{{
-" }}}
 
-" main syntax groups {{{
 
 " Tables
 syntax match VimwikiTableRow /^\s*|.\+|\s*$/ 
@@ -175,22 +184,12 @@ syntax match VimwikiTableRow /^\s*|.\+|\s*$/
                            \ VimwikiEqInT,
                            \ @Spell
 
-" }}}
-
-" header groups highlighting "{{{
-"}}}
 
 
-" syntax group highlighting "{{{ 
+" syntax group highlighting
 hi def link VimwikiWeblink1 VimwikiLink
 hi def link VimwikiWeblink1T VimwikiLink
 
 hi def link VimwikiWikiLink1 VimwikiLink
 hi def link VimwikiWikiLink1T VimwikiLink
-"}}}
 
-
-
-" EMBEDDED syntax setup "{{{
-"}}}
-"
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index 15d8b60..6287c7c 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -1,10 +1,12 @@
-" vim:tabstop=2:shiftwidth=2:expandtab:foldmethod=marker:textwidth=99
+" vim:tabstop=2:shiftwidth=2:expandtab:textwidth=99
 " Vimwiki syntax file
-" Desc: Defines mediaWiki syntax
+" Description: Defines mediaWiki syntax
 " Home: https://github.com/vimwiki/vimwiki/
 
+
 " see the comments in vimwiki_default.vim for some info about this file
 
+
 let s:media_syntax = g:vimwiki_syntax_variables['media']
 
 " text: $ equation_inline $
@@ -78,5 +80,6 @@ let s:media_syntax.bold_match = '''''''__Text__'''''''
 " ^- this strange looking thing is equivalent to "'''__Text__'''" but since we later
 " want to call escape() on this string, we must keep it in single quotes
 let s:media_syntax.wikilink = '\[\[\zs[^\\\]|]\+\ze\%(|[^\\\]]\+\)\?\]\]'
-let s:media_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)' " XXX rework to mediawiki categories format?
-let s:media_syntax.tag_match = '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:\([^:[:space:]]\+:\)*\(\s\|$\)' " XXX rework to mediawiki categories format?
+let s:media_syntax.tag_search = '\(^\|\s\)\zs:\([^:''[:space:]]\+:\)\+\ze\(\s\|$\)'
+let s:media_syntax.tag_match = '\(^\|\s\):\([^:''[:space:]]\+:\)*__Tag__:'.
+      \ '\([^:[:space:]]\+:\)*\(\s\|$\)'

From c6e87ab661e4bfc28550904379ffd9093e881d59 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 20 Apr 2018 07:06:59 +0200
Subject: [PATCH 085/108] Remove already deactivated emoticons highlighting

---
 syntax/vimwiki.vim                 | 4 ----
 syntax/vimwiki_markdown_custom.vim | 1 -
 2 files changed, 5 deletions(-)

diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 15f0a9e..6da8a61 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -227,8 +227,6 @@ execute 'syn match VimwikiSuperScriptT contained /'
 execute 'syn match VimwikiSubScriptT contained /'
       \ .vimwiki#vars#get_syntaxlocal('char_subscript').'/'
 
-" Emoticons
-"syntax match VimwikiEmoticons /\%((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
 
 execute 'syntax match VimwikiTodo /'. vimwiki#vars#get_global('rxTodo') .'/'
 
@@ -239,7 +237,6 @@ syntax match VimwikiTableRow /^\s*|.\+|\s*$/
       \ transparent contains=VimwikiCellSeparator,
                            \ VimwikiLinkT,
                            \ VimwikiNoExistsLinkT,
-                           \ VimwikiEmoticons,
                            \ VimwikiTodo,
                            \ VimwikiBoldT,
                            \ VimwikiItalicT,
@@ -411,7 +408,6 @@ hi def link VimwikiLinkT VimwikiLink
 hi def link VimwikiList Identifier
 hi def link VimwikiListTodo VimwikiList
 hi def link VimwikiCheckBoxDone Comment
-hi def link VimwikiEmoticons Character
 hi def link VimwikiHR Identifier
 hi def link VimwikiTag Keyword
 
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index 9ecf924..038772c 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -171,7 +171,6 @@ syntax match VimwikiTableRow /^\s*|.\+|\s*$/
                            \ VimwikiWeblink1T,
                            \ VimwikiWikiLink1T,
                            \ VimwikiNoExistsLinkT,
-                           \ VimwikiEmoticons,
                            \ VimwikiTodo,
                            \ VimwikiBoldT,
                            \ VimwikiItalicT,

From 3f8bb1261fab28cde9a1fa8a8ad5a9ef88a31fc6 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Fri, 20 Apr 2018 07:13:21 +0200
Subject: [PATCH 086/108] Make some functions script-local

---
 autoload/vimwiki/html.vim | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 6579109..bce5465 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -357,7 +357,7 @@ endfunction
 
 "   match n-th ARG within {{URL[|ARG1|ARG2|...]}}
 " *c,d,e),...
-function! vimwiki#html#incl_match_arg(nn_index)
+function! s:incl_match_arg(nn_index)
   let rx = vimwiki#vars#get_global('rxWikiInclPrefix'). vimwiki#vars#get_global('rxWikiInclUrl')
   let rx = rx . repeat(vimwiki#vars#get_global('rxWikiInclSeparator') .
         \ vimwiki#vars#get_global('rxWikiInclArg'), a:nn_index-1)
@@ -371,7 +371,7 @@ function! vimwiki#html#incl_match_arg(nn_index)
 endfunction
 
 
-function! vimwiki#html#linkify_link(src, descr)
+function! s:linkify_link(src, descr)
   let src_str = ' href="'.s:escape_html_attribute(a:src).'"'
   let descr = substitute(a:descr,'^\s*\(.*\)\s*$','\1','')
   let descr = (descr == "" ? a:src : descr)
@@ -382,7 +382,7 @@ function! vimwiki#html#linkify_link(src, descr)
 endfunction
 
 
-function! vimwiki#html#linkify_image(src, descr, verbatim_str)
+function! s:linkify_image(src, descr, verbatim_str)
   let src_str = ' src="'.a:src.'"'
   let descr_str = (a:descr != '' ? ' alt="'.a:descr.'"' : '')
   let verbatim_str = (a:verbatim_str != '' ? ' '.a:verbatim_str : '')
@@ -395,7 +395,7 @@ function! s:tag_weblink(value)
   let str = a:value
   let url = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWeblinkMatchUrl'))
   let descr = matchstr(str, vimwiki#vars#get_syntaxlocal('rxWeblinkMatchDescr'))
-  let line = vimwiki#html#linkify_link(url, descr)
+  let line = s:linkify_link(url, descr)
   return line
 endfunction
 
@@ -411,8 +411,8 @@ function! s:tag_wikiincl(value)
   " otherwise, assume image transclusion
   if line == ''
     let url_0 = matchstr(str, vimwiki#vars#get_global('rxWikiInclMatchUrl'))
-    let descr = matchstr(str, vimwiki#html#incl_match_arg(1))
-    let verbatim_str = matchstr(str, vimwiki#html#incl_match_arg(2))
+    let descr = matchstr(str, s:incl_match_arg(1))
+    let verbatim_str = matchstr(str, s:incl_match_arg(2))
 
     let link_infos = vimwiki#base#resolve_link(url_0)
 
@@ -428,7 +428,7 @@ function! s:tag_wikiincl(value)
     endif
 
     let url = escape(url, '#')
-    let line = vimwiki#html#linkify_image(url, descr, verbatim_str)
+    let line = s:linkify_image(url, descr, verbatim_str)
   endif
   return line
 endfunction
@@ -476,7 +476,7 @@ function! s:tag_wikilink(value)
     let line = html_link
   endif
 
-  let line = vimwiki#html#linkify_link(line, descr)
+  let line = s:linkify_link(line, descr)
   return line
 endfunction
 

From 1176f60ec639c4c8fd476b6a335416feeffa36ef Mon Sep 17 00:00:00 2001
From: Ben Burrill <bburrill98@gmail.com>
Date: Sun, 22 Apr 2018 11:58:39 -0700
Subject: [PATCH 087/108] Allow any visual mode to be used to create a link

The only real condition we care about is whether the selection is
contained within a single line.  It is practical to do something like
V<CR> to link a whole line, and AFAIK there is no reason for why that
doesn't work.
---
 autoload/vimwiki/base.vim          | 6 +++---
 autoload/vimwiki/markdown_base.vim | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 2f8aa52..929928e 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1986,7 +1986,7 @@ function! s:normalize_link_syntax_v()
     endif
 
     " Put substitution in register " and change text
-    call setreg('"', sub, 'v')
+    call setreg('"', substitute(sub, '\n', '', ''), visualmode())
     normal! `>""pgvd
   finally
     call setreg('"', default_register_save, registertype_save)
@@ -2002,8 +2002,8 @@ function! vimwiki#base#normalize_link(is_visual_mode)
   else
     if !a:is_visual_mode
       call s:normalize_link_syntax_n()
-    elseif visualmode() ==# 'v' && line("'<") == line("'>")
-      " action undefined for 'line-wise' or 'multi-line' visual mode selections
+    elseif line("'<") == line("'>")
+      " action undefined for multi-line visual mode selections
       call s:normalize_link_syntax_v()
     endif
   endif
diff --git a/autoload/vimwiki/markdown_base.vim b/autoload/vimwiki/markdown_base.vim
index 6468c75..f1ce091 100644
--- a/autoload/vimwiki/markdown_base.vim
+++ b/autoload/vimwiki/markdown_base.vim
@@ -122,7 +122,7 @@ function! s:normalize_link_syntax_v()
           \ '__LinkUrl__', visual_selection, '')
     let link = s:safesubstitute(link, '__LinkDescription__', visual_selection, '')
 
-    call setreg('"', link, 'v')
+    call setreg('"', substitute(link, '\n', '', ''), visualmode())
 
     " paste result
     norm! `>""pgvd
@@ -141,8 +141,8 @@ function! vimwiki#markdown_base#normalize_link(is_visual_mode)
   else
     if !a:is_visual_mode
       call s:normalize_link_syntax_n()
-    elseif visualmode() ==# 'v' && line("'<") == line("'>")
-      " action undefined for 'line-wise' or 'multi-line' visual mode selections
+    elseif line("'<") == line("'>")
+      " action undefined for multi-line visual mode selections
       call s:normalize_link_syntax_v()
     endif
   endif

From c8b02e4bc59dbeca81cce2a2c94af7e795a8c167 Mon Sep 17 00:00:00 2001
From: Zhuang Ma <chumpma@gmail.com>
Date: Wed, 2 May 2018 03:22:07 +0800
Subject: [PATCH 088/108] Use markdown link syntax for the TOC

Ref #483
Fix #200
---
 autoload/vimwiki/base.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 929928e..19f6094 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1816,7 +1816,11 @@ function! vimwiki#base#table_of_contents(create)
   for [lvl, link, desc] in complete_header_infos
     let esc_link = substitute(link, "'", "''", 'g')
     let esc_desc = substitute(desc, "'", "''", 'g')
-    let link = s:safesubstitute(vimwiki#vars#get_global('WikiLinkTemplate2'), '__LinkUrl__',
+    let link_tpl = vimwiki#vars#get_global('WikiLinkTemplate2')
+    if vimwiki#vars#get_wikilocal('syntax') == 'markdown'
+      let link_tpl = vimwiki#vars#get_syntaxlocal('Weblink1Template')
+    endif
+    let link = s:safesubstitute(link_tpl, '__LinkUrl__',
           \ '#'.esc_link, '')
     let link = s:safesubstitute(link, '__LinkDescription__', esc_desc, '')
     call add(lines, startindent.repeat(indentstring, lvl-1).bullet.link)

From b5dcd1ebebd39e0314aa7c741d76aa1b6a5ea73b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Fri, 27 Apr 2018 14:48:21 +0200
Subject: [PATCH 089/108] Allow wikis in subfolders of other wikis

---
 autoload/vimwiki/base.vim | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 19f6094..4013dda 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -82,18 +82,23 @@ endfunction
 " to any registered wiki.
 " The path can be the full path or just the directory of the file
 function! vimwiki#base#find_wiki(path)
+  let bestmatch = -1
+  let bestlen = 0
   let path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(a:path))
   for idx in range(vimwiki#vars#number_of_wikis())
     let idx_path = expand(vimwiki#vars#get_wikilocal('path', idx))
     let idx_path = vimwiki#path#path_norm(vimwiki#path#chomp_slash(idx_path))
-    if vimwiki#path#is_equal(vimwiki#path#path_common_pfx(idx_path, path), idx_path)
-      return idx
+    let common_pfx = vimwiki#path#path_common_pfx(idx_path, path)
+    if vimwiki#path#is_equal(common_pfx, idx_path)
+      if len(common_pfx) > bestlen
+        let bestlen = len(common_pfx)
+        let bestmatch = idx
+      endif
     endif
     let idx += 1
   endfor
 
-  " an orphan page has been detected
-  return -1
+  return bestmatch
 endfunction
 
 

From d73c1e4ed6d6db4cc36148cae5d94901f1997604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Tue, 8 May 2018 10:54:48 +0200
Subject: [PATCH 090/108] Remove useless statement

---
 autoload/vimwiki/base.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 4013dda..8eb6397 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -95,7 +95,6 @@ function! vimwiki#base#find_wiki(path)
         let bestmatch = idx
       endif
     endif
-    let idx += 1
   endfor
 
   return bestmatch

From 9b744b42b1eb7b715ea52b3a930668127d9cfcfc Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 9 May 2018 22:02:07 +0200
Subject: [PATCH 091/108] Fix bug when creating a temporary wiki

Fix #488
---
 plugin/vimwiki.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index fe2cb80..52d6025 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -48,6 +48,10 @@ function! s:create_temporary_wiki()
         \ }
 
   call vimwiki#vars#add_temporary_wiki(new_temp_wiki_settings)
+
+  " Update the wiki number of the current buffer, because it may have changed when adding this
+  " temporary wiki.
+  call vimwiki#vars#set_bufferlocal('wiki_nr', vimwiki#base#find_wiki(expand('%:p')))
 endfunction
 
 

From 818fe930c35c2637397cff2ac3c4a7aba4c43c29 Mon Sep 17 00:00:00 2001
From: Huy Le <dacrazyazn@gmail.com>
Date: Sun, 13 May 2018 07:43:47 -0600
Subject: [PATCH 092/108] set script variable for autowrite_all

Ref #492
---
 plugin/vimwiki.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 52d6025..dc8606f 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -13,6 +13,7 @@ let g:loaded_vimwiki = 1
 let s:old_cpo = &cpo
 set cpo&vim
 
+let s:vimwiki_autowriteall_saved = g:vimwiki_autowriteall
 
 " this is called when the cursor leaves the buffer
 function! s:setup_buffer_leave()

From ed58049dbef69fff88f25e0615655547ffd2aa62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Mon, 14 May 2018 10:49:26 +0200
Subject: [PATCH 093/108] Revert "set script variable for autowrite_all"

This reverts commit 818fe930c35c2637397cff2ac3c4a7aba4c43c29.
---
 plugin/vimwiki.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index dc8606f..52d6025 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -13,7 +13,6 @@ let g:loaded_vimwiki = 1
 let s:old_cpo = &cpo
 set cpo&vim
 
-let s:vimwiki_autowriteall_saved = g:vimwiki_autowriteall
 
 " this is called when the cursor leaves the buffer
 function! s:setup_buffer_leave()

From f96d0c26d3711740bd93fc5e065e53db52b18edc Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 15 May 2018 21:26:05 +0200
Subject: [PATCH 094/108] Add section to doc about getting help via IRC

Fix #490
---
 doc/vimwiki.txt | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 92ce907..8fa39e6 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -47,10 +47,11 @@ CONTENTS                                                             *vimwiki*
         12.2. Temporary Wiki         |vimwiki-temporary-wiki|
         12.3. Per-Wiki Options       |vimwiki-local-options|
         12.4. Global Options         |vimwiki-global-options|
-    13. Contributing                 |vimwiki-contributing|
-    14. Development                  |vimwiki-development|
-    15. Changelog                    |vimwiki-changelog|
-    16. License                      |vimwiki-license|
+    13. Getting help                 |vimwiki-help|
+    14. Contributing & Bug reports   |vimwiki-contributing|
+    15. Development                  |vimwiki-development|
+    16. Changelog                    |vimwiki-changelog|
+    17. License                      |vimwiki-license|
 
 
 ==============================================================================
@@ -2886,9 +2887,17 @@ Value           Description~
 
 Default: 0
 
+==============================================================================
+13. Getting help                                                *vimwiki-help*
+
+For questions, discussions, praise or rants there is a mailing list:
+https://groups.google.com/forum/#!forum/vimwiki
+
+Also, there is the IRC channel #vimwiki on Freenode which can be accessed via
+webchat: https://webchat.freenode.net/?channels=#vimwiki
 
 ==============================================================================
-13. Contributing                                        *vimwiki-contributing*
+14. Contributing & Bug reports                          *vimwiki-contributing*
 
 Your help in making Vimwiki better is really appreciated!
 Any help, whether it is a spelling correction or a code snippet to patch --
@@ -2903,12 +2912,8 @@ Issues can be filed at https://github.com/vimwiki/vimwiki/issues/.
 If you want to provide a pull request on GitHub, please start from the dev
 branch, not from the master branch.
 
-For questions, discussions, praise or rants there is a mailing list:
-https://groups.google.com/forum/#!forum/vimwiki
-
-
 ==============================================================================
-14. Development                                          *vimwiki-development*
+15. Development                                          *vimwiki-development*
 
 Homepage: http://vimwiki.github.io/
 Github: https://github.com/vimwiki/vimwiki/
@@ -2955,7 +2960,7 @@ Contributors and their Github usernames in roughly chronological order:
 
 
 ==============================================================================
-15. Changelog                                              *vimwiki-changelog*
+16. Changelog                                              *vimwiki-changelog*
 
 
 Issue numbers starting with '#' are issues from
@@ -3197,7 +3202,7 @@ http://code.google.com/p/vimwiki/issues/list
     * First public version.
 
 ==============================================================================
-16. License                                                  *vimwiki-license*
+17. License                                                  *vimwiki-license*
 
 The MIT License
 http://www.opensource.org/licenses/mit-license.php

From 7c5935b9ba1b903775e24f84740cfeb37961ebcd Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 15 May 2018 21:48:58 +0200
Subject: [PATCH 095/108] Do init s:vimwiki_autowriteall_saved, but perhaps
 with the default value

Ref #492
---
 plugin/vimwiki.vim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 52d6025..3f876db 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -14,6 +14,13 @@ let s:old_cpo = &cpo
 set cpo&vim
 
 
+if exists('g:vimwiki_autowriteall')
+  let s:vimwiki_autowriteall_saved = g:vimwiki_autowriteall
+else
+  let s:vimwiki_autowriteall_saved = 1
+endif
+
+
 " this is called when the cursor leaves the buffer
 function! s:setup_buffer_leave()
   " don't do anything if it's not managed by Vimwiki (that is, when it's not in

From c08a9f8c7147c3bb1d30d803d62526914634fc71 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 16 May 2018 20:14:36 +0200
Subject: [PATCH 096/108] Add a note to the doc on how to use :VWS case
 insensitively

Fix #480
---
 doc/vimwiki.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 8fa39e6..92c0394 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -737,6 +737,11 @@ Vimwiki file.
     To display next match use |:lnext| command.
     To display previous match use |:lprevious| command.
 
+    Hint: this feature is simply a wrapper around |:lvimgrep|. For a
+    description of how the pattern can look like, see |:vimgrep|. For example,
+    to do a case insensitive search, use >
+    :VWS /\cpattern/
+
 *:VimwikiBacklinks*
 *:VWB*
     Search for wikilinks to the current wiki page in all files of current

From 057fa3930394506fae8eca1bd993859602918f0c Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 17 May 2018 20:06:27 +0200
Subject: [PATCH 097/108] :VimwikiMakeDiaryNote makes a new note in the current
 wiki

... like the doc says, instead of always using the first wiki.
Also, fix the menu entry, which always led to the wrong diary.

Fix #482
---
 autoload/vimwiki/diary.vim | 27 +++++++++++++++------------
 plugin/vimwiki.vim         | 10 +++++-----
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 278da34..c55b3eb 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -170,21 +170,25 @@ function! s:format_diary()
 endfunction
 
 
+" The given wiki number a:wnum is 1 for the first wiki, 2 for the second and so on. This is in
+" contrast to most other places, where counting starts with 0. When a:wnum is 0, the current wiki
+" is used.
 function! vimwiki#diary#make_note(wnum, ...)
-  if a:wnum > vimwiki#vars#number_of_wikis()
-    echomsg 'Vimwiki Error: Wiki '.a:wnum.' is not registered in g:vimwiki_list!'
+  if a:wnum == 0
+    let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
+  else
+    let wiki_nr = a:wnum - 1
+  endif
+
+  if wiki_nr >= vimwiki#vars#number_of_wikis()
+    echomsg 'Vimwiki Error: Wiki '.wiki_nr.' is not registered in g:vimwiki_list!'
     return
   endif
 
   " TODO: refactor it. base#goto_index uses the same
-  if a:wnum > 0
-    let idx = a:wnum - 1
-  else
-    let idx = 0
-  endif
 
-  call vimwiki#path#mkdir(vimwiki#vars#get_wikilocal('path', idx).
-        \ vimwiki#vars#get_wikilocal('diary_rel_path', idx))
+  call vimwiki#path#mkdir(vimwiki#vars#get_wikilocal('path', wiki_nr).
+        \ vimwiki#vars#get_wikilocal('diary_rel_path', wiki_nr))
 
   let cmd = 'edit'
   if a:0
@@ -202,7 +206,7 @@ function! vimwiki#diary#make_note(wnum, ...)
     let link = 'diary:'.vimwiki#diary#diary_date_link()
   endif
 
-  call vimwiki#base#open_link(cmd, link, s:diary_index(idx))
+  call vimwiki#base#open_link(cmd, link, s:diary_index(wiki_nr))
 endfunction
 
 
@@ -297,8 +301,7 @@ function! vimwiki#diary#calendar_action(day, month, year, week, dir)
     endif
   endif
 
-  " XXX: Well, +1 is for inconsistent index basing...
-  call vimwiki#diary#make_note(vimwiki#vars#get_bufferlocal('wiki_nr')+1, 0, link)
+  call vimwiki#diary#make_note(0, 0, link)
 endfunction
 
 
diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 3f876db..50405de 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -266,14 +266,14 @@ command! -count=1 VimwikiTabIndex
 command! -count=1 VimwikiDiaryIndex
       \ call vimwiki#diary#goto_diary_index(v:count1)
 command! -count=1 VimwikiMakeDiaryNote
-      \ call vimwiki#diary#make_note(v:count1)
+      \ call vimwiki#diary#make_note(v:count)
 command! -count=1 VimwikiTabMakeDiaryNote
-      \ call vimwiki#diary#make_note(v:count1, 1)
+      \ call vimwiki#diary#make_note(v:count, 1)
 command! -count=1 VimwikiMakeYesterdayDiaryNote
-      \ call vimwiki#diary#make_note(v:count1, 0,
+      \ call vimwiki#diary#make_note(v:count, 0,
       \ vimwiki#diary#diary_date_link(localtime() - 60*60*24))
 command! -count=1 VimwikiMakeTomorrowDiaryNote
-      \ call vimwiki#diary#make_note(v:count1, 0,
+      \ call vimwiki#diary#make_note(v:count, 0,
       \ vimwiki#diary#diary_date_link(localtime() + 60*60*24))
 
 command! VimwikiDiaryGenerateLinks
@@ -341,7 +341,7 @@ function! s:build_menu(topmenu)
     execute 'menu '.a:topmenu.'.Open\ index.'.norm_path.
           \ ' :call vimwiki#base#goto_index('.idx.')<CR>'
     execute 'menu '.a:topmenu.'.Open/Create\ diary\ note.'.norm_path.
-          \ ' :call vimwiki#diary#make_note('.idx.')<CR>'
+          \ ' :call vimwiki#diary#make_note('.(idx+1).')<CR>'
   endfor
 endfunction
 

From c5b39a12b4bbdcec4f9f87cf7b592ef3464f97d3 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 17 May 2018 20:18:53 +0200
Subject: [PATCH 098/108] Add a help section to the readme

Ref #490
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index a407040..0160ee9 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,14 @@ Or download the [zip archive](https://github.com/vimwiki/vimwiki/archive/master.
 
 Then launch Vim, run `:Helptags` and then `:help vimwiki` to verify it was installed.
 
+
+Getting help
+==============================================================================
+
+Have a question? Visit the IRC channel `#vimwiki` on Freenode ([webchat](https://webchat.freenode.net/?channels=#vimwiki))
+or post to the [mailing list](https://groups.google.com/forum/#!forum/vimwiki).
+
+
 ----
 \* Screenshots made with the [solarized colorscheme](https://github.com/altercation/vim-colors-solarized)
 and [lightline](https://github.com/itchyny/lightline.vim)

From 946b3feb12d201327d2da576aff71d9a4139392b Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 17 May 2018 21:47:50 +0200
Subject: [PATCH 099/108] Fix one-off error when opening a wiki via the menu

---
 plugin/vimwiki.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/vimwiki.vim b/plugin/vimwiki.vim
index 50405de..1076588 100644
--- a/plugin/vimwiki.vim
+++ b/plugin/vimwiki.vim
@@ -339,7 +339,7 @@ function! s:build_menu(topmenu)
     let norm_path = fnamemodify(vimwiki#vars#get_wikilocal('path', idx), ':h:t')
     let norm_path = escape(norm_path, '\ \.')
     execute 'menu '.a:topmenu.'.Open\ index.'.norm_path.
-          \ ' :call vimwiki#base#goto_index('.idx.')<CR>'
+          \ ' :call vimwiki#base#goto_index('.(idx+1).')<CR>'
     execute 'menu '.a:topmenu.'.Open/Create\ diary\ note.'.norm_path.
           \ ' :call vimwiki#diary#make_note('.(idx+1).')<CR>'
   endfor

From 9a8854756ec1cb596cb4dc5782c0ac3e06f21169 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sun, 20 May 2018 15:18:05 +0200
Subject: [PATCH 100/108] Refactoring: simplify and remove some regexes

---
 autoload/vimwiki/base.vim          | 30 +++++++++++++++---------------
 autoload/vimwiki/vars.vim          | 26 ++++++++++++--------------
 syntax/vimwiki.vim                 |  4 ++--
 syntax/vimwiki_markdown_custom.vim |  4 ++--
 4 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 8eb6397..2bb8c4d 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -116,11 +116,6 @@ function! vimwiki#base#resolve_link(link_text, ...)
 
   let link_text = a:link_text
 
-  " if link is schemeless add wikiN: scheme
-  if link_text !~# vimwiki#vars#get_global('rxSchemeUrl')
-    let link_text = 'wiki'.source_wiki.':'.link_text
-  endif
-
 
   let link_infos = {
         \ 'index': -1,
@@ -129,18 +124,23 @@ function! vimwiki#base#resolve_link(link_text, ...)
         \ 'anchor': '',
         \ }
 
+  if link_text == ''
+    return link_infos
+  endif
 
-  " extract scheme
-  let link_infos.scheme = matchstr(link_text, vimwiki#vars#get_global('rxSchemeUrlMatchScheme'))
-  if link_infos.scheme == '' || link_text == ''
-    let link_infos.filename = ''   " malformed link
-    return link_infos
+  let scheme = matchstr(link_text, '^\zs'.vimwiki#vars#get_global('rxSchemes').'\ze:')
+  if scheme == ''
+    let link_infos.scheme = 'wiki'.source_wiki
+  else
+    let link_infos.scheme = scheme
+
+    if link_infos.scheme !~# '\mwiki\d\+\|diary\|local\|file'
+      let link_infos.filename = link_text  " unknown scheme, may be a weblink
+      return link_infos
+    endif
+
+    let link_text = matchstr(link_text, '^'.vimwiki#vars#get_global('rxSchemes').':\zs.*\ze')
   endif
-  if link_infos.scheme !~# '\mwiki\d\+\|diary\|local\|file'
-    let link_infos.filename = link_text  " unknown scheme, may be a weblink
-    return link_infos
-  endif
-  let link_text = matchstr(link_text, vimwiki#vars#get_global('rxSchemeUrlMatchUrl'))
 
   let is_wiki_link = link_infos.scheme =~# '\mwiki\d\+' || link_infos.scheme ==# 'diary'
 
diff --git a/autoload/vimwiki/vars.vim b/autoload/vimwiki/vars.vim
index 82a6032..7b8e507 100644
--- a/autoload/vimwiki/vars.vim
+++ b/autoload/vimwiki/vars.vim
@@ -77,31 +77,29 @@ function! s:populate_global_variables()
 
   " Scheme regexes must be defined even if syntax file is not loaded yet cause users should be
   " able to <leader>w<leader>w without opening any vimwiki file first
-  let g:vimwiki_global_vars.schemes = 'wiki\d\+,diary,local'
-  let g:vimwiki_global_vars.web_schemes1 = 'http,https,file,ftp,gopher,telnet,nntp,ldap,rsync'.
-        \ ',imap,pop,irc,ircs,cvs,svn,svn+ssh,git,ssh,fish,sftp'
-  let web_schemes2 = 'mailto,news,xmpp,sip,sips,doi,urn,tel,data'
+  let g:vimwiki_global_vars.schemes = join(['wiki\d\+', 'diary', 'local'], '\|')
+  let g:vimwiki_global_vars.web_schemes1 = join(['http', 'https', 'file', 'ftp', 'gopher',
+        \ 'telnet', 'nntp', 'ldap', 'rsync', 'imap', 'pop', 'irc', 'ircs', 'cvs', 'svn', 'svn+ssh',
+        \ 'git', 'ssh', 'fish', 'sftp'], '\|')
+  let web_schemes2 =
+        \ join(['mailto', 'news', 'xmpp', 'sip', 'sips', 'doi', 'urn', 'tel', 'data'], '\|')
 
-  let rx_schemes = '\%('.
-        \ join(split(g:vimwiki_global_vars.schemes, '\s*,\s*'), '\|').'\|'.
-        \ join(split(g:vimwiki_global_vars.web_schemes1, '\s*,\s*'), '\|').'\|'.
-        \ join(split(web_schemes2, '\s*,\s*'), '\|').
+  let g:vimwiki_global_vars.rxSchemes = '\%('.
+        \ g:vimwiki_global_vars.schemes . '\|'.
+        \ g:vimwiki_global_vars.web_schemes1 . '\|'.
+        \ web_schemes2 .
         \ '\)'
 
-  let g:vimwiki_global_vars.rxSchemeUrl = rx_schemes.':.*'
-  let g:vimwiki_global_vars.rxSchemeUrlMatchScheme = '\zs'.rx_schemes.'\ze:.*'
-  let g:vimwiki_global_vars.rxSchemeUrlMatchUrl = rx_schemes.':\zs.*\ze'
-
   " match URL for common protocols; see http://en.wikipedia.org/wiki/URI_scheme
   " http://tools.ietf.org/html/rfc3986
   let rxWebProtocols =
         \ '\%('.
           \ '\%('.
-            \ '\%('.join(split(g:vimwiki_global_vars.web_schemes1, '\s*,\s*'), '\|').'\):'.
+            \ '\%('.g:vimwiki_global_vars.web_schemes1 . '\):'.
             \ '\%(//\)'.
           \ '\)'.
         \ '\|'.
-          \ '\%('.join(split(web_schemes2, '\s*,\s*'), '\|').'\):'.
+          \ '\%('.web_schemes2.'\):'.
         \ '\)'
 
   let g:vimwiki_global_vars.rxWeblinkUrl = rxWebProtocols . '\S\{-1,}'. '\%(([^ \t()]*)\)\='
diff --git a/syntax/vimwiki.vim b/syntax/vimwiki.vim
index 6da8a61..512aad9 100644
--- a/syntax/vimwiki.vim
+++ b/syntax/vimwiki.vim
@@ -106,8 +106,8 @@ call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWeblink'), 'VimwikiL
 " WikiLink
 " All remaining schemes are highlighted automatically
 let s:rxSchemes = '\%('.
-      \ join(split(vimwiki#vars#get_global('schemes'), '\s*,\s*'), '\|').'\|'.
-      \ join(split(vimwiki#vars#get_global('web_schemes1'), '\s*,\s*'), '\|').
+      \ vimwiki#vars#get_global('schemes') . '\|'.
+      \ vimwiki#vars#get_global('web_schemes1').
       \ '\):'
 
 " a) match [[nonwiki-scheme-URL]]
diff --git a/syntax/vimwiki_markdown_custom.vim b/syntax/vimwiki_markdown_custom.vim
index 038772c..46f3ce1 100644
--- a/syntax/vimwiki_markdown_custom.vim
+++ b/syntax/vimwiki_markdown_custom.vim
@@ -104,8 +104,8 @@ call s:add_target_syntax_ON(vimwiki#vars#get_syntaxlocal('rxWeblink1'), 'Vimwiki
 " WikiLink
 " All remaining schemes are highlighted automatically
 let s:rxSchemes = '\%('.
-      \ join(split(vimwiki#vars#get_global('schemes'), '\s*,\s*'), '\|').'\|'.
-      \ join(split(vimwiki#vars#get_global('web_schemes1'), '\s*,\s*'), '\|').
+      \ vimwiki#vars#get_global('schemes') . '\|'.
+      \ vimwiki#vars#get_global('web_schemes1').
       \ '\):'
 
 " a) match [nonwiki-scheme-URL]

From d5c6cee5eb3526027c5079e9f672c25ab299f0e0 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Wed, 23 May 2018 18:28:03 +0200
Subject: [PATCH 101/108] Make VimwikiMakeDiaryNote etc work outside a wiki
 buffer

Fix #497
---
 autoload/vimwiki/diary.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index c55b3eb..1ceeb2e 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -176,6 +176,9 @@ endfunction
 function! vimwiki#diary#make_note(wnum, ...)
   if a:wnum == 0
     let wiki_nr = vimwiki#vars#get_bufferlocal('wiki_nr')
+    if wiki_nr < 0  " this happens when e.g. VimwikiMakeDiaryNote was called outside a wiki buffer
+      let wiki_nr = 0
+    endif
   else
     let wiki_nr = a:wnum - 1
   endif

From 966a94bd477f3b10ae7b66693508274c9aaf1288 Mon Sep 17 00:00:00 2001
From: Nick Borden <nrborden@gmail.com>
Date: Mon, 28 May 2018 12:24:29 -0700
Subject: [PATCH 102/108] Diary links should use markdown syntax when
 appropriate (#500)

When markdown syntax is enabled, generated links should use markdown
link syntax.

Fix #499
---
 autoload/vimwiki/diary.vim | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/autoload/vimwiki/diary.vim b/autoload/vimwiki/diary.vim
index 1ceeb2e..164211d 100644
--- a/autoload/vimwiki/diary.vim
+++ b/autoload/vimwiki/diary.vim
@@ -150,17 +150,21 @@ function! s:format_diary()
             \ '__Header__', s:get_month_name(month), ''))
 
       for [fl, cap] in s:sort(items(g_files[year][month]))
-        if empty(cap)
-          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate1'),
-                \ '__LinkUrl__', fl, '')
-          let entry = substitute(entry, '__LinkDescription__', cap, '')
-          call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
-        else
-          let entry = substitute(vimwiki#vars#get_global('WikiLinkTemplate2'),
-                \ '__LinkUrl__', fl, '')
-          let entry = substitute(entry, '__LinkDescription__', cap, '')
-          call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
+        let link_tpl = vimwiki#vars#get_global('WikiLinkTemplate2')
+
+        if vimwiki#vars#get_wikilocal('syntax') == 'markdown'
+          let link_tpl = vimwiki#vars#get_syntaxlocal('Weblink1Template')
+
+          if empty(cap) " When using markdown syntax, we should ensure we always have a link description.
+            let cap = fl
+          endif
+        elseif empty(cap)
+          let link_tpl = vimwiki#vars#get_global('WikiLinkTemplate1')
         endif
+
+        let entry = substitute(link_tpl, '__LinkUrl__', fl, '')
+        let entry = substitute(entry, '__LinkDescription__', cap, '')
+        call add(result, repeat(' ', vimwiki#lst#get_list_margin()).'* '.entry)
       endfor
 
     endfor

From 7ad365e142eeb9e0a4776c15a72ce6621f6d3000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 30 May 2018 20:17:54 +0200
Subject: [PATCH 103/108] Add Installation-Guide for Vim-plug

Installation-note for vim-plug is important since vimplug defaults to master branch. See #503
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 0160ee9..11d0824 100644
--- a/README.md
+++ b/README.md
@@ -135,6 +135,15 @@ Installation using [Pathogen](http://www.vim.org/scripts/script.php?script_id=23
     cd bundle
     git clone https://github.com/vimwiki/vimwiki.git
 
+Installation using [Vim-Plug](https://github.com/junegunn/vim-plug)
+------------------------------------------------------------------------------
+
+Add the following to the plugin-configuration in your vimrc:
+
+    Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
+
+Then run `:PlugInstall`.
+
 Installation using [Vundle](https://github.com/VundleVim/Vundle.vim)
 ------------------------------------------------------------------------------
 

From 4d4e88bfa26de6a638e4f3c0e3b7c315d29e9e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sun, 17 Jun 2018 15:31:57 +0200
Subject: [PATCH 104/108] Improve heuristic for cleaning urls in link descr.

---
 autoload/vimwiki/base.vim | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index 2bb8c4d..b1768c2 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1869,6 +1869,12 @@ function! s:clean_url(url)
   let url = filter(url, 'v:val !=# "https\:"')
   let url = filter(url, 'v:val !=# "file\:"')
   let url = filter(url, 'v:val !=# "xml\:"')
+  let url = filter(url, 'v:val !=# "html"')
+  let url = filter(url, 'v:val !=# "htm"')
+  let url = filter(url, 'v:val !=# "php"')
+  " remove words consisting of only hexadecimal digits or non-word characters
+  let url = filter(url, 'v:val !~  "^\\A\\{4,}$"')
+  let url = filter(url, 'v:val !~  "^\\x\\{4,}$" || v:val !~ "\\d"')
   return join(url, " ")
 endfunction
 

From 50c95f1beffa3d80a0e636a28c23dd51a6bd7803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Sun, 17 Jun 2018 16:10:44 +0200
Subject: [PATCH 105/108] Remove all protocols and tlds on URL-cleaning

Also make removal of protocol, tld and 'www' more robust against
fails-positives by considering the position in the url.
---
 autoload/vimwiki/base.vim | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index b1768c2..e13623a 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1858,20 +1858,17 @@ endfunction
 
 
 function! s:clean_url(url)
-  let url = split(a:url, '/\|=\|-\|&\|?\|\.')
+  " remove protocol and tld
+  let url = substitute(a:url, '^\a\+://', '', '')
+  let url = substitute(url, '^\([^/]\+\).\a\{2,4}/', '\1/', '')
+  let url = split(url, '/\|=\|-\|&\|?\|\.')
   let url = filter(url, 'v:val !=# ""')
-  let url = filter(url, 'v:val !=# "www"')
-  let url = filter(url, 'v:val !=# "com"')
-  let url = filter(url, 'v:val !=# "org"')
-  let url = filter(url, 'v:val !=# "net"')
-  let url = filter(url, 'v:val !=# "edu"')
-  let url = filter(url, 'v:val !=# "http\:"')
-  let url = filter(url, 'v:val !=# "https\:"')
-  let url = filter(url, 'v:val !=# "file\:"')
-  let url = filter(url, 'v:val !=# "xml\:"')
-  let url = filter(url, 'v:val !=# "html"')
-  let url = filter(url, 'v:val !=# "htm"')
-  let url = filter(url, 'v:val !=# "php"')
+  if url[0] == "www"
+    let url = url[1:]
+  endif
+  if url[-1] =~ '^\(htm\|html\|php\)$'
+    let url = url[0:-2]
+  endif
   " remove words consisting of only hexadecimal digits or non-word characters
   let url = filter(url, 'v:val !~  "^\\A\\{4,}$"')
   let url = filter(url, 'v:val !~  "^\\x\\{4,}$" || v:val !~ "\\d"')

From 786aa470e36895107376e2f03326225b636be58b Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Tue, 26 Jun 2018 21:38:55 +0200
Subject: [PATCH 106/108] Remove the user-mappable function and use commands
 instead.

---
 autoload/vimwiki/base.vim | 14 ++++++------
 doc/vimwiki.txt           | 45 ++++++++++++---------------------------
 ftplugin/vimwiki.vim      |  4 ++--
 3 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
index e13623a..3a6e128 100644
--- a/autoload/vimwiki/base.vim
+++ b/autoload/vimwiki/base.vim
@@ -1101,8 +1101,10 @@ function! vimwiki#base#find_prev_link()
 endfunction
 
 
-" This is an API function, that is, remappable by the user. Don't change the signature.
-function! vimwiki#base#follow_link(split, reuse, move_cursor, ...)
+function! vimwiki#base#follow_link(split, ...)
+  let reuse_other_split_window = a:0 >= 1 ? a:1 : 0
+  let move_cursor_to_new_window = a:0 >= 2 ? a:2 : 1
+
   " Parse link at cursor and pass to VimwikiLinkHandler, or failing that, the
   " default open_link handler
 
@@ -1138,7 +1140,7 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...)
 
     " if we want to and can reuse a split window, jump to that window and open
     " the new file there
-    if (a:split ==# 'hsplit' || a:split ==# 'vsplit') && a:reuse
+    if (a:split ==# 'hsplit' || a:split ==# 'vsplit') && reuse_other_split_window
       let previous_window_nr = winnr('#')
       if previous_window_nr > 0 && previous_window_nr != winnr()
         execute previous_window_nr . 'wincmd w'
@@ -1162,7 +1164,7 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...)
 
     call vimwiki#base#open_link(cmd, lnk)
 
-    if !a:move_cursor
+    if !move_cursor_to_new_window
       if (a:split ==# 'hsplit' || a:split ==# 'vsplit')
         execute 'wincmd p'
       elseif a:split ==# 'tab'
@@ -1171,8 +1173,8 @@ function! vimwiki#base#follow_link(split, reuse, move_cursor, ...)
     endif
 
   else
-    if a:0 > 0
-      execute "normal! ".a:1
+    if a:0 >= 3
+      execute "normal! ".a:3
     else
       call vimwiki#base#normalize_link(0)
     endif
diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 92c0394..4c4e541 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -677,12 +677,24 @@ Vimwiki file.
 *:VimwikiGoBackLink*
     Go back to the wiki page you came from.
 
-*:VimwikiSplitLink*
+*:VimwikiSplitLink* [reuse] [move_cursor]
     Split and follow wiki link (create target wiki page if needed).
 
-*:VimwikiVSplitLink*
+    If the argument 'reuse' is given and nonzero, the link is opened in a
+    possibly existing split window instead of making a new split.
+
+    If 'move_cursor' is given and nonzero, the cursor moves to the window with
+    the opened link, otherwise, it stays in the window with the link.
+
+*:VimwikiVSplitLink* [reuse] [move_cursor]
     Vertical split and follow wiki link (create target wiki page if needed).
 
+    If the argument 'reuse' is given and nonzero, the link is opened in a
+    possibly existing split window instead of making a new split.
+
+    If 'move_cursor' is given and nonzero, the cursor moves to the window with
+    the opened link, otherwise, it stays in the window with the link.
+
 *:VimwikiTabnewLink*
     Follow wiki link in a new tab (create target wiki page if needed).
 
@@ -829,35 +841,6 @@ Vimwiki file.
     are specified, outputs all tags.  To make this command work properly, make
     sure the tags have been built (see |vimwiki-build-tags|).
 
-------------------------------------------------------------------------------
-4.3. Functions                                              *vimwiki-functions*
-
-Functions to interact with Vimwiki. (It's intended that most commands will be
-replaced with corresponding function calls in the future.)
-Warning: this is currently unstable and likely to change.
-
-
-To map them to a key, use >
- nnoremap <C-K> :call vimwiki#base#function_name(arg1, arg2)<CR>
-<
-
-                                                          *vimwiki-follow_link*
-vimwiki#base#follow_link({split}, {reuse}, {move_cursor})
-    Open the link under the cursor. {split} can have the following values:
-        'nosplit'       open the link in the current window
-        'vsplit'        open in a vertically split window
-        'hsplit'        open in a horizontally split window
-        'tab'           open in a new tab
-
-    If {reuse} is 1 and {split} one of 'vsplit' or 'hsplit', open the link in
-    a possibly existing split window instead of making a new split.
-
-    If {move_cursor} is 1 the cursor moves to the window or tab with the
-    opened link, otherwise, it stays in the window or tab with the link.
-
-    For example, <CR> is per default mapped to
-    vimwiki#base#follow_link('nosplit', 0, 1)
-
 
 ==============================================================================
 5. Wiki syntax                                                *vimwiki-syntax*
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index 6b517dc..a5c2e69 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -259,8 +259,8 @@ command! -buffer VimwikiDeleteLink call vimwiki#base#delete_link()
 command! -buffer VimwikiRenameLink call vimwiki#base#rename_link()
 command! -buffer VimwikiFollowLink call vimwiki#base#follow_link('nosplit', 0, 1)
 command! -buffer VimwikiGoBackLink call vimwiki#base#go_back_link()
-command! -buffer VimwikiSplitLink call vimwiki#base#follow_link('hsplit', 0, 1)
-command! -buffer VimwikiVSplitLink call vimwiki#base#follow_link('vsplit', 0, 1)
+command! -buffer -nargs=* VimwikiSplitLink call vimwiki#base#follow_link('hsplit', <f-args>)
+command! -buffer -nargs=* VimwikiVSplitLink call vimwiki#base#follow_link('vsplit', <f-args>)
 
 command! -buffer -nargs=? VimwikiNormalizeLink call vimwiki#base#normalize_link(<f-args>)
 

From 51017f6b5efb8c38336a93530fba912bda7d6b77 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 5 Jul 2018 14:00:18 +0200
Subject: [PATCH 107/108] Update changelog

Ref #504
---
 doc/vimwiki.txt | 77 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 70 insertions(+), 7 deletions(-)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 4c4e541..4081f93 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -9,7 +9,7 @@
               |___|  |___| |_|   |_||__| |__||___| |___| |_||___|            ~
 
 
-                               Version: 2.3
+                               Version: 2.4
 
 ==============================================================================
 CONTENTS                                                             *vimwiki*
@@ -877,6 +877,8 @@ is decorated: >
   super^script^
   sub,,script,,
 
+Furthermore, there are a number of words which are highlighted extra flashy:
+TODO, DONE, STARTED, FIXME, FIXED, XXX.
 
 ------------------------------------------------------------------------------
 5.2. Links                                              *vimwiki-syntax-links*
@@ -2247,15 +2249,15 @@ be located at https://github.com/vimwiki-backup/vimwiki/issues/384
 To use the internal wiki2html converter, use an empty string (the default).
 
 
-vimwiki-option-custom_wiki2html_args
+*vimwiki-option-custom_wiki2html_args*
 -----------------------------------------------------------------------------
 Key                     Default value~
 custom_wiki2html_args   ''
 
-Description
+Description~
 If a custom script is called with |vimwiki-option-custom_wiki2html|, additional
-parameters can be passed by setting them using 'custom_wiki2html_args' in
-|g:vimwiki_list|.
+parameters can be passed using this option: >
+  let g:vimwiki_list = [{'path': '~/path/', 'custom_wiki2html_args': 'stuff'}]
 
 
 *vimwiki-option-list_margin*
@@ -2945,6 +2947,20 @@ Contributors and their Github usernames in roughly chronological order:
     - Daniel Trnka (@trnila)
     - Yuchen Pei (@ycpei)
     - @maqiv
+    - @dpc
+    - Drew Hays (@Dru89)
+    - Daniel Etrata (@danetrata)
+    - Keith Haber (@kjhaber)
+    - @beuerle
+    - Silvio Ricardo Cordeiro (@silvioricardoc)
+    - @blyoa
+    - Jonathan McElroy (@jonathanmcelroy)
+    - @PetrusZ
+    - Brian Gianforcaro (@bgianfo)
+    - Ben Burrill (@benburrill)
+    - Zhuang Ma (@mzlogin)
+    - Huy Le (@huynle)
+    - Nick Borden (@hcwndbyw)
 
 
 ==============================================================================
@@ -2957,14 +2973,61 @@ http://code.google.com/p/vimwiki/issues/list. They may be accessible from
 https://github.com/vimwiki-backup/vimwiki/issues.
 
 
+2.4 (not yet released)~
+
+New:~
+    * Add the option |g:vimwiki_text_ignore_newline|.
+    * |g:vimwiki_listsyms| can have fewer or more than 5 symbols.
+    * glx on a list item marks a checkbox as won't do, see |vimwiki_glx|.
+    * Add the option |g:vimwiki_listsym_rejected| to set the character used
+      for won't-do list items.
+    * gln and glp change the "done" status of a checkbox, see |vimwiki_gln|.
+    * |:VimwikiSplitLink| and |:VimwikiVSplitLink| can now reuse an existing
+      split window and not move the cursor.
+    * Add 'aH' and 'iH' text objects, see |vimwiki-text-objects|.
+    * Add the keys |vimwiki_[[|, |vimwiki_]]|, |vimwiki_[=|, |vimwiki_]=| and
+      |vimwiki_]u| for navigating between headers.
+    * Add the command |:VimwikiMakeTomorrowDiaryNote|.
+    * |g:vimwiki_folding| has a new option 'custom'.
+    * Add the ':quick' option for faster folding, see |g:vimwiki_folding|.
+    * Add the %date placeholder, see |vimwiki-date|.
+    * Add the option |vimwiki-option-custom_wiki2html_args|.
+    * Add support for HTML-style comments when using markdown syntax.
+
+Removed:~
+    * Remove the undocumented and buggy command :VimwikiReadLocalOptions
+      which allowed to store Vimwiki related settings in a local file.
+    * Remove the undocumented command :VimwikiPrintWikiState.
+    * For complicated reasons, Vimwiki doesn't clean up its settings anymore
+      if you change the filetype of a wiki buffer.
+
+Fixed:~
+    * Make |vimwiki-option-automatic_nested_syntaxes| work also for markdown.
+    * Issue #236: Highlight math blocks as TeX math, not TeX.
+    * Issue #264: Don't overwrite mappings to i_<CR> from other plugins.
+    * Fix an error where <BS> sometimes didn't work under Windows.
+    * Issue #302: |:VimwikiDiaryGenerateLinks| had issues with markdown.
+    * Issue #445: Better handling of |'autowriteall'| and |'hidden'|.
+    * Improve 'ah' and 'ih' text objects, see |vimwiki-text-objects|.
+    * Allow opening of links using Powershell.
+    * Allow any visual mode to be used with |vimwiki_+|.
+    * Markdown syntax for |vimwiki-toc| is used, when appropriate.
+    * Wikis can now be in subfolders of other wikis.
+    * Issue #482: |:VimwikiMakeDiaryNote| now uses the diary of the current wiki.
+    * Opening the diary and wikis from the menu works correctly now.
+    * Issue #497: Make |:VimwikiMakeDiaryNote| work outside a wiki buffer.
+    * Use markdown syntax in the diary when appropriate.
+    * Various other minor fixes.
+
+
 2.3 (2016-03-31)~
 
-New:
+New:~
     * Add |:VimwikiMakeYesterdayDiaryNote| command
     * Issue #128: add option |vimwiki-option-automatic_nested_syntaxes|
     * Issue #192: Sort links in the list generated by |:VimwikiGenerateTags|
 
-Fixed:
+Fixed:~
     * Issue #176: Fix issue when the wiki path contains spaces
     * Also look for tags in wiki files in subdirectories
     * Locate the .tags file correctly on Windows

From 44a1f3a6f36d9695029a5134a8ffd2809228d5e9 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Thu, 5 Jul 2018 14:11:37 +0200
Subject: [PATCH 108/108] Add a note to the doc about setting Vimwiki settings

Ref #510
---
 doc/vimwiki.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index 4081f93..90b5b12 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -1841,6 +1841,12 @@ as described in |vimwiki-register-wiki|, or may be registered on the fly as
 described in |vimwiki-temporary-wiki|.  For a list of per-wiki options, see
 |vimwiki-local-options|.
 
+A note for Vim power users:
+If you have an elaborated Vim setup, where you e.g. load plugins
+conditionally, make sure the settings are set before Vimwiki loads (that is,
+before plugin/vimwiki.vim is sourced). If this is not possible, try this
+command after the Vimwiki settings are (re-) set: >
+  :call vimwiki#vars#init()
 
 ------------------------------------------------------------------------------
 12.1 Registered Wiki                  *g:vimwiki_list* *vimwiki-register-wiki*