diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-01-08 16:06:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-01-08 16:06:37 +0100 |
| commit | 2a8a3ecb67de119e39b4a9ffaff3460036db0210 (patch) | |
| tree | bc76cf48934293007aeff07fcf74188a0a5708cb /runtime/autoload/tohtml.vim | |
| parent | 13d831ff0c8879bdf59e6de35a106ccb9b4766da (diff) | |
| download | vim-git-2a8a3ecb67de119e39b4a9ffaff3460036db0210.tar.gz | |
Updated runtime files.
Diffstat (limited to 'runtime/autoload/tohtml.vim')
| -rw-r--r-- | runtime/autoload/tohtml.vim | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim index c9dd2f764..ce97ec9fa 100644 --- a/runtime/autoload/tohtml.vim +++ b/runtime/autoload/tohtml.vim @@ -1,6 +1,6 @@ " Vim autoload file for the tohtml plugin. " Maintainer: Ben Fritz <fritzophrenic@gmail.com> -" Last Change: 2010 Oct 07 +" Last Change: 2011 Jan 05 " " Additional contributors: " @@ -600,18 +600,18 @@ func! tohtml#GetUserSettings() "{{{ endif " get current option settings with appropriate defaults {{{ - call tohtml#GetOption(user_settings, 'no_progress', !has("statusline") ) - call tohtml#GetOption(user_settings, 'diff_one_file', 0 ) - call tohtml#GetOption(user_settings, 'number_lines', &number ) - call tohtml#GetOption(user_settings, 'use_css', 1 ) - call tohtml#GetOption(user_settings, 'ignore_conceal', 0 ) - call tohtml#GetOption(user_settings, 'ignore_folding', 0 ) - call tohtml#GetOption(user_settings, 'dynamic_folds', 0 ) - call tohtml#GetOption(user_settings, 'no_foldcolumn', 0 ) - call tohtml#GetOption(user_settings, 'hover_unfold', 0 ) - call tohtml#GetOption(user_settings, 'no_pre', 0 ) - call tohtml#GetOption(user_settings, 'whole_filler', 0 ) - call tohtml#GetOption(user_settings, 'use_xhtml', 0 ) + call tohtml#GetOption(user_settings, 'no_progress', !has("statusline") ) + call tohtml#GetOption(user_settings, 'diff_one_file', 0 ) + call tohtml#GetOption(user_settings, 'number_lines', &number ) + call tohtml#GetOption(user_settings, 'use_css', 1 ) + call tohtml#GetOption(user_settings, 'ignore_conceal', 0 ) + call tohtml#GetOption(user_settings, 'ignore_folding', 0 ) + call tohtml#GetOption(user_settings, 'dynamic_folds', 0 ) + call tohtml#GetOption(user_settings, 'no_foldcolumn', 0 ) + call tohtml#GetOption(user_settings, 'hover_unfold', 0 ) + call tohtml#GetOption(user_settings, 'no_pre', 0 ) + call tohtml#GetOption(user_settings, 'whole_filler', 0 ) + call tohtml#GetOption(user_settings, 'use_xhtml', 0 ) " }}} " override those settings that need it {{{ @@ -643,6 +643,18 @@ func! tohtml#GetUserSettings() "{{{ let user_settings.no_pre = 1 endif "}}} + " set up expand_tabs option after all the overrides so we know the + " appropriate defaults {{{ + if user_settings.no_pre == 0 + call tohtml#GetOption(user_settings, + \ 'expand_tabs', + \ &expandtab || &ts != 8 || user_settings.number_lines || + \ (user_settings.dynamic_folds && !user_settings.no_foldcolumn)) + else + let user_settings.expand_tabs = 1 + endif + " }}} + if exists("g:html_use_encoding") "{{{ " user specified the desired MIME charset, figure out proper " 'fileencoding' from it or warn the user if we cannot |