From 16a812f8df55c589874ad93fa3df45bc63d86afb Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Thu, 18 Jan 2018 20:34:43 +0800 Subject: [PATCH] Fix #1266 --- autoload/SpaceVim.vim | 11 +++++++++-- autoload/SpaceVim/layers/core/statusline.vim | 15 +++++++++------ doc/SpaceVim.txt | 7 ++++++- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index bad58ac91..83abd8e62 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -195,11 +195,18 @@ let g:spacevim_statusline_inactive_separator = 'arrow' " \ 'version control info' " \ ] " < -let g:spacevim_statusline_left_sections = ['winnr', 'filename', 'major mode', 'syntax checking', 'minor mode lighters', 'version control info', 'hunks'] +let g:spacevim_statusline_left_sections = ['winnr', 'filename', 'major mode', + \ 'syntax checking', 'minor mode lighters', + \ 'version control info', 'hunks'] "" " Define the right section of statusline in active windows. By default: " > -" let g:spacevim_statusline_right_sections = ['fileformat', 'cursorpos'] +" g:spacevim_statusline_right_sections = +" \ [ +" \ 'fileformat', +" \ 'cursorpos', +" \ 'percentage' +" \ ] " < let g:spacevim_statusline_right_sections = ['fileformat', 'cursorpos', 'percentage'] diff --git a/autoload/SpaceVim/layers/core/statusline.vim b/autoload/SpaceVim/layers/core/statusline.vim index 3b05d201d..381fba984 100644 --- a/autoload/SpaceVim/layers/core/statusline.vim +++ b/autoload/SpaceVim/layers/core/statusline.vim @@ -33,12 +33,6 @@ let s:i_separators = { \ 'nil' : ['', ''], \ } let s:loaded_modes = [] -if index(g:spacevim_plugin_groups, 'checkers') != -1 - call add(s:loaded_modes, 'syntax-checking') -endif -if &cc ==# '80' - call add(s:loaded_modes, 'fill-column-indicator') -endif let s:modes = { \ 'center-cursor': { \ 'icon' : '⊝', @@ -81,6 +75,15 @@ let s:loaded_sections_l = g:spacevim_statusline_left_sections let [s:lsep , s:rsep] = get(s:separators, g:spacevim_statusline_separator, s:separators['arrow']) let [s:ilsep , s:irsep] = get(s:i_separators, g:spacevim_statusline_inactive_separator, s:i_separators['arrow']) +if index(g:spacevim_plugin_groups, 'checkers') != -1 + call add(s:loaded_modes, 'syntax-checking') +endif +if &cc ==# '80' + call add(s:loaded_modes, 'fill-column-indicator') +endif +if index(s:loaded_sections_r, 'whitespace') + call add(s:loaded_modes, 'whitespace') +endif " build in sections for SpaceVim statusline function! s:winnr(...) abort if a:0 > 1 diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index a8dbac151..4ba54fd61 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -227,7 +227,12 @@ Define the left section of statusline in active windows. By default: *g:spacevim_statusline_right_sections* Define the right section of statusline in active windows. By default: > - let g:spacevim_statusline_right_sections = ['fileformat', 'cursorpos'] + g:spacevim_statusline_right_sections = + \ [ + \ 'fileformat', + \ 'cursorpos', + \ 'percentage' + \ ] < *g:spacevim_statusline_unicode_symbols*