1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-03-23 17:49:57 +08:00

change(core): deprecate statusline_unicode_symbols option

Problem: the option name is too long
Solution: change `statusline_unicode_symbols` to `statusline_unicode`
This commit is contained in:
Shidong Wang 2021-09-25 21:09:11 +08:00
parent 72349e4dd7
commit 483e3c0e29
No known key found for this signature in database
GPG Key ID: 41BB7053E835C848
7 changed files with 19 additions and 20 deletions

View File

@ -578,21 +578,21 @@ let g:spacevim_statusline_left_sections = ['winnr', 'filename', 'major mode',
let g:spacevim_statusline_right_sections = ['fileformat', 'cursorpos', 'percentage'] let g:spacevim_statusline_right_sections = ['fileformat', 'cursorpos', 'percentage']
"" ""
" @section statusline_unicode_symbols, options-statusline_unicode_symbols " @section statusline_unicode, options-statusline_unicode
" @parentsection options " @parentsection options
" Enable/Disable unicode symbols in statusline, includes the mode icons and " Enable/Disable unicode symbols in statusline, includes the mode icons and
" fileformat icons. This option is enabled by default, to disable it: " fileformat icons. This option is enabled by default, to disable it:
" > " >
" statusline_unicode_symbols = false " statusline_unicode = false
" < " <
"" ""
" Enable/Disable unicode symbols in statusline, includes the mode icons and " Enable/Disable unicode symbols in statusline, includes the mode icons and
" fileformat icons. This option is enabled by default, to disable it: " fileformat icons. This option is enabled by default, to disable it:
" > " >
" let g:spacevim_statusline_unicode_symbols = 0 " let g:spacevim_statusline_unicode = 0
" < " <
let g:spacevim_statusline_unicode_symbols = 1 let g:spacevim_statusline_unicode = 1
"" ""
" Enable/Disable language specific leader, by default you can use `,` ket " Enable/Disable language specific leader, by default you can use `,` ket
" instead of `SPC` `l`. " instead of `SPC` `l`.

View File

@ -70,7 +70,7 @@ function! s:git_branch() abort
call fugitive#detect(getcwd()) call fugitive#detect(getcwd())
let head = fugitive#head() let head = fugitive#head()
endif endif
if g:spacevim_statusline_unicode_symbols == 1 if g:spacevim_statusline_unicode == 1
return empty(head) ? '' : '  '.head . ' ' . s:gtm_status() return empty(head) ? '' : '  '.head . ' ' . s:gtm_status()
else else
return empty(head) ? '' : ' '.head . ' ' . s:gtm_status() return empty(head) ? '' : ' '.head . ' ' . s:gtm_status()
@ -80,7 +80,7 @@ function! s:git_branch() abort
elseif exists('g:loaded_git') elseif exists('g:loaded_git')
try try
let head = '%{git#branch#current()}' let head = '%{git#branch#current()}'
if g:spacevim_statusline_unicode_symbols == 1 if g:spacevim_statusline_unicode == 1
return empty(head) ? '' : '  '.head . ' ' . s:gtm_status() return empty(head) ? '' : '  '.head . ' ' . s:gtm_status()
else else
return empty(head) ? '' : ' '.head . ' ' . s:gtm_status() return empty(head) ? '' : ' '.head . ' ' . s:gtm_status()

View File

@ -142,7 +142,7 @@ function! s:filename() abort
endfunction endfunction
function! s:fileformat() abort function! s:fileformat() abort
if g:spacevim_statusline_unicode_symbols == 1 if g:spacevim_statusline_unicode == 1
let g:_spacevim_statusline_fileformat = s:SYSTEM.fileformat() let g:_spacevim_statusline_fileformat = s:SYSTEM.fileformat()
else else
let g:_spacevim_statusline_fileformat = &ff let g:_spacevim_statusline_fileformat = &ff
@ -156,13 +156,13 @@ function! s:major_mode() abort
endfunction endfunction
function! s:modes() abort function! s:modes() abort
if g:spacevim_statusline_unicode_symbols if g:spacevim_statusline_unicode
let m = ' ❖ ' let m = ' ❖ '
else else
let m = ' # ' let m = ' # '
endif endif
for mode in s:loaded_modes for mode in s:loaded_modes
if g:spacevim_statusline_unicode_symbols if g:spacevim_statusline_unicode
let m .= s:modes[mode].icon . ' ' let m .= s:modes[mode].icon . ' '
else else
let m .= s:modes[mode].icon_asc . ' ' let m .= s:modes[mode].icon_asc . ' '
@ -202,14 +202,14 @@ endfunction
function! s:battery_status() abort function! s:battery_status() abort
if executable('acpi') if executable('acpi')
let battery = split(system('acpi'))[-1][:-2] let battery = split(system('acpi'))[-1][:-2]
if g:spacevim_statusline_unicode_symbols if g:spacevim_statusline_unicode
return ' ' . s:ICON.battery_status(battery) . ' ' return ' ' . s:ICON.battery_status(battery) . ' '
else else
return ' ⚡' . battery . ' ' return ' ⚡' . battery . ' '
endif endif
elseif executable('pmset') elseif executable('pmset')
let battery = matchstr(system('pmset -g batt'), '\d\+%')[:-2] let battery = matchstr(system('pmset -g batt'), '\d\+%')[:-2]
if g:spacevim_statusline_unicode_symbols if g:spacevim_statusline_unicode
return ' ' . s:ICON.battery_status(battery) . ' ' return ' ' . s:ICON.battery_status(battery) . ' '
else else
return ' ⚡' . battery . ' ' return ' ⚡' . battery . ' '

View File

@ -69,8 +69,7 @@ CONTENTS *SpaceVim-contents*
49. statusline_iseparator.......|SpaceVim-options-statusline_iseparator| 49. statusline_iseparator.......|SpaceVim-options-statusline_iseparator|
50. statusline_left_sections.|SpaceVim-options-statusline_left_sections| 50. statusline_left_sections.|SpaceVim-options-statusline_left_sections|
51. statusline_separator.........|SpaceVim-options-statusline_separator| 51. statusline_separator.........|SpaceVim-options-statusline_separator|
52. statusline_unicode_symbols 52. statusline_unicode.............|SpaceVim-options-statusline_unicode|
.................................|SpaceVim-options-statusline_unicode_symbols|
53. terminal_cursor_shape.......|SpaceVim-options-terminal_cursor_shape| 53. terminal_cursor_shape.......|SpaceVim-options-terminal_cursor_shape|
54. vim_help_language...............|SpaceVim-options-vim_help_language| 54. vim_help_language...............|SpaceVim-options-vim_help_language|
55. vimcompatible.......................|SpaceVim-options-vimcompatible| 55. vimcompatible.......................|SpaceVim-options-vimcompatible|
@ -699,12 +698,12 @@ See more details in: http://spacevim.org/documentation/#statusline
============================================================================== ==============================================================================
STATUSLINE_UNICODE_SYMBOLS *SpaceVim-options-statusline_unicode_symbols* STATUSLINE_UNICODE *SpaceVim-options-statusline_unicode*
Enable/Disable unicode symbols in statusline, includes the mode icons and Enable/Disable unicode symbols in statusline, includes the mode icons and
fileformat icons. This option is enabled by default, to disable it: fileformat icons. This option is enabled by default, to disable it:
> >
statusline_unicode_symbols = false statusline_unicode = false
< <
============================================================================== ==============================================================================
@ -1010,11 +1009,11 @@ Define the right section of statusline in active windows. By default:
\ ] \ ]
< <
*g:spacevim_statusline_unicode_symbols* *g:spacevim_statusline_unicode*
Enable/Disable unicode symbols in statusline, includes the mode icons and Enable/Disable unicode symbols in statusline, includes the mode icons and
fileformat icons. This option is enabled by default, to disable it: fileformat icons. This option is enabled by default, to disable it:
> >
let g:spacevim_statusline_unicode_symbols = 0 let g:spacevim_statusline_unicode = 0
< <
*g:spacevim_enable_language_specific_leader* *g:spacevim_enable_language_specific_leader*

View File

@ -621,7 +621,7 @@ SpaceVim 所支持的分割符以及截图如下:
**SpaceVim 功能模块:** **SpaceVim 功能模块:**
功能模块可以通过 `SPC t m m` 快捷键显示或者隐藏。默认使用 Unicode 字符,可通过设置 `statusline_unicode_symbols = false` 来启用 ASCII 字符。(或许在终端中无法设置合适的字体时,可使用这一选项)。 功能模块可以通过 `SPC t m m` 快捷键显示或者隐藏。默认使用 Unicode 字符,可通过设置 `statusline_unicode = false` 来启用 ASCII 字符。(或许在终端中无法设置合适的字体时,可使用这一选项)。
状态栏中功能模块内的字符显示与否,同如下快捷键功能保持一致: 状态栏中功能模块内的字符显示与否,同如下快捷键功能保持一致:

View File

@ -681,7 +681,7 @@ Here is an exhaustive set of screenshots for all the available separators:
The minor mode area can be toggled on and off with `SPC t m m`. The minor mode area can be toggled on and off with `SPC t m m`.
Unicode symbols are displayed by default. Add `statusline_unicode_symbols = false` to your custom configuration file to use ASCII characters instead (may be useful in the terminal if you cannot set an appropriate font). Unicode symbols are displayed by default. Add `statusline_unicode = false` to your custom configuration file to use ASCII characters instead (may be useful in the terminal if you cannot set an appropriate font).
The letters displayed in the statusline correspond to the key bindings used to toggle them. The letters displayed in the statusline correspond to the key bindings used to toggle them.

View File

@ -24,7 +24,7 @@
windows_index_type = 3 windows_index_type = 3
enable_tabline_filetype_icon = false enable_tabline_filetype_icon = false
enable_statusline_mode = false enable_statusline_mode = false
statusline_unicode_symbols = false statusline_unicode = false
# Enable vim compatible mode, avoid changing origin vim key bindings # Enable vim compatible mode, avoid changing origin vim key bindings
vimcompatible = true vimcompatible = true