aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2019-09-06 21:10:46 +0200
committerJustin M. Keyes <justinkz@gmail.com>2019-09-06 12:10:46 -0700
commit754ea8d27e92fafeed4890ba5bc523dcbebecc76 (patch)
tree33bc8fbc9abb9ba9955f701729ad889b693f4213
parent8db62ac57d230ee7c528e09c88ae0a2a52c5b5f2 (diff)
downloadrneovim-754ea8d27e92fafeed4890ba5bc523dcbebecc76.tar.gz
rneovim-754ea8d27e92fafeed4890ba5bc523dcbebecc76.tar.bz2
rneovim-754ea8d27e92fafeed4890ba5bc523dcbebecc76.zip
runtime: :TOhtml workaround for missing 'vts' option #10960
Hot fix for 0.4 This commit should be reverted when &vts option is added. close #10831
-rw-r--r--runtime/autoload/tohtml.vim2
-rw-r--r--runtime/syntax/2html.vim2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim
index 2d874c690d..9c3d4d2d7e 100644
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -779,7 +779,7 @@ func! tohtml#GetUserSettings() "{{{
if user_settings.no_pre == 0
call tohtml#GetOption(user_settings,
\ 'expand_tabs',
- \ &expandtab || &ts != 8 || &vts != '' || user_settings.number_lines ||
+ \ &expandtab || &ts != 8 || (exists("+vts") && &vts != '') || user_settings.number_lines ||
\ (user_settings.dynamic_folds && !user_settings.no_foldcolumn))
else
let user_settings.expand_tabs = 1
diff --git a/runtime/syntax/2html.vim b/runtime/syntax/2html.vim
index 4a2d1d3959..91bb0e0d4a 100644
--- a/runtime/syntax/2html.vim
+++ b/runtime/syntax/2html.vim
@@ -1570,7 +1570,7 @@ while s:lnum <= s:end
if s:settings.expand_tabs
let s:offset = 0
let s:idx = stridx(s:expandedtab, "\t")
- let s:tablist = split(&vts,',')
+ let s:tablist = exists("+vts") ? split(&vts,',') : []
if empty(s:tablist)
let s:tablist = [ &ts ]
endif