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 01/33] 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 02/33] 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 03/33] 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 04/33] 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 05/33] 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 06/33] 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 07/33] 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 08/33] 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 09/33] 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 10/33] 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 11/33] 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 12/33] 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 13/33] 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 14/33] 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 15/33] 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 16/33] 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 17/33] 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 18/33] 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 19/33] 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 20/33] 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 4e16db926f86ebcd068bd3b2c65ba36ff1fed463 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 11 Nov 2017 21:52:07 +0100
Subject: [PATCH 21/33] 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 68ad4675a3f740f9ad116308a4230775b14ddf35 Mon Sep 17 00:00:00 2001
From: EinfachToll <istjanichtzufassen@googlemail.com>
Date: Sat, 10 Feb 2018 21:41:07 +0100
Subject: [PATCH 22/33] 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 23/33] 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 24/33] 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 25/33] 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 26/33] 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 27/33] 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 28/33] 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 29/33] 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 30/33] 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 31/33] 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 32/33] 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 33/33] 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')