commit edb72680a1a7376537ce8a7221f550160c6c4a90
parent b89c22fe03a25701ed4e01fd1cf9334e630c2b14
Author: mMontu <marcmontu@yahoo.com.br>
Date: Thu, 8 Jan 2015 14:14:16 -0200
Use backward compatible version of shiftwidth()
Diffstat:
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/autoload/vimwiki/base.vim b/autoload/vimwiki/base.vim
@@ -1725,7 +1725,7 @@ function! vimwiki#base#table_of_contents(create)
\ '__Header__', '\='."'".g:vimwiki_toc_header."'", ''))
let startindent = repeat(' ', vimwiki#lst#get_list_margin())
- let indentstring = repeat(' ', shiftwidth())
+ let indentstring = repeat(' ', vimwiki#u#sw())
for [lvl, link, desc] in headers
let esc_link = substitute(link, "'", "''", 'g')
let esc_desc = substitute(desc, "'", "''", 'g')
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
@@ -932,9 +932,9 @@ function! s:decrease_level(item) "{{{
else
let old_indent = indent(a:item.lnum)
if &shiftround
- let new_indent = (old_indent - 1) / shiftwidth() * shiftwidth()
+ let new_indent = (old_indent - 1) / vimwiki#u#sw() * vimwiki#u#sw()
else
- let new_indent = old_indent - shiftwidth()
+ let new_indent = old_indent - vimwiki#u#sw()
endif
call s:set_indent(a:item.lnum, new_indent)
let removed_indent = new_indent - old_indent
@@ -952,9 +952,9 @@ function! s:increase_level(item) "{{{
else
let old_indent = indent(a:item.lnum)
if &shiftround
- let new_indent = (old_indent / shiftwidth() + 1) * shiftwidth()
+ let new_indent = (old_indent / vimwiki#u#sw() + 1) * vimwiki#u#sw()
else
- let new_indent = old_indent + shiftwidth()
+ let new_indent = old_indent + vimwiki#u#sw()
endif
call s:set_indent(a:item.lnum, new_indent)
let additional_indent = new_indent - old_indent
diff --git a/autoload/vimwiki/u.vim b/autoload/vimwiki/u.vim
@@ -52,3 +52,14 @@ endfunction "}}}
function vimwiki#u#reload_regexes_custom() "{{{
execute 'runtime! syntax/vimwiki_'.VimwikiGet('syntax').'_custom.vim'
endfunction "}}}
+
+" Backward compatible version of the built-in function shiftwidth()
+if exists('*shiftwidth') "{{{
+ func vimwiki#u#sw()
+ return shiftwidth()
+ endfunc
+else
+ func vimwiki#u#sw()
+ return &sw
+ endfunc
+endif "}}}