y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use new access functions for global variables -- part 2

Browse Source 
Ref #256
This commit is contained in:
EinfachToll
2016-12-21 21:28:48 +01:00
parent e6d997867a
commit 49bdf7fa47
9 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/vimwiki/base.vim
View File

@ -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
"}}}

6
autoload/vimwiki/html.vim
View File

@ -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]

2
autoload/vimwiki/lst.vim
View File

@ -1499,7 +1499,7 @@ function! vimwiki#lst#setup_marker_infos() "{{{
\ vimwiki#u#escape(g:vimwiki_number_types[-1][1]) . '\)'
else
"regex that matches nothing
let g:vimwiki_rxListNumber = '$^'
let g:vimwiki_rxListNumber = '$^'
endif
"the user can set the listsyms as string, but vimwiki needs a list