1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-04-14 23:49:19 +08:00

Fix guide statusline

This commit is contained in:
wsdjeg 2017-07-21 06:18:59 +08:00
parent 346d2b9db3
commit 26a95a683f
2 changed files with 12 additions and 11 deletions

View File

@ -268,14 +268,14 @@ function! s:active() abort
endfunction
function! s:inactive() abort
return '%#SpaceVim_statusline_ia#' . s:winnr() . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#'
\ . '%#SpaceVim_statusline_b#' . s:filename() . ''
\ . ' ' . &filetype . ' '
\ . s:modes() . ''
\ . s:git_branch() . ''
return '%#SpaceVim_statusline_ia#' . s:winnr() . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#' . s:lsep
\ . '%#SpaceVim_statusline_b#' . s:filename() . s:ilsep
\ . ' ' . &filetype . ' ' . s:ilsep
\ . s:modes() . s:ilsep
\ . s:git_branch() . s:ilsep
\ . ' %='
\ . '%{" " . &ff . "|" . (&fenc!=""?&fenc:&enc) . " "}'
\ . ' %P '
\ . s:irsep . '%{" " . &ff . "|" . (&fenc!=""?&fenc:&enc) . " "}'
\ . s:irsep . ' %P '
endfunction
function! s:gitgutter() abort
if exists('b:gitgutter_summary')
@ -341,8 +341,8 @@ function! SpaceVim#layers#core#statusline#toggle_section(name) abort
let &l:statusline = SpaceVim#layers#core#statusline#get(1)
endfunction
function! Test() abort
echo s:loaded_modes
function! SpaceVim#layers#core#statusline#rsep()
return get(s:separators, g:spacevim_statusline_separator, s:separators['arrow'])
endfunction
function! SpaceVim#layers#core#statusline#config() abort

View File

@ -411,11 +411,11 @@ function! s:updateStatusline() abort
let gname = substitute(gname,' ', '\\ ', 'g')
endif
exe 'setlocal statusline=%#LeaderGuiderPrompt#\ Guide:\ ' .
\ '%#LeaderGuiderSep1#' .
\ '%#LeaderGuiderSep1#' . s:lsep .
\ '%#LeaderGuiderName#\ ' .
\ SpaceVim#mapping#leader#getName(s:prefix_key)
\ . get(s:, 'prefix_key_inp', '') . gname
\ . '\ %#LeaderGuiderSep2#%#LeaderGuiderFill#'
\ . '\ %#LeaderGuiderSep2#' . s:lsep . '%#LeaderGuiderFill#'
\ . s:guide_help_msg()
endfunction
@ -578,6 +578,7 @@ call SpaceVim#mapping#guide#register_prefix_descriptions(
call SpaceVim#mapping#guide#register_prefix_descriptions(
\ 'z',
\ 'g:_spacevim_mappings_z')
let [s:lsep, s:rsep] = SpaceVim#layers#core#statusline#rsep()
let &cpo = s:save_cpo
unlet s:save_cpo