diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 9eca225ce..977be4484 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -93,7 +93,6 @@ let g:spacevim_realtime_leader_guide = 0 " < let g:spacevim_enable_key_frequency = 0 let g:spacevim_autocomplete_method = '' -let g:spacevim_enable_cursorcolumn = 0 "" " SpaceVim default checker is neomake. If you want to use syntastic, use: " > @@ -125,11 +124,19 @@ let g:spacevim_sidebar_width = 30 let g:spacevim_snippet_engine = 'neosnippet' let g:spacevim_enable_neocomplcache = 0 "" -" Enable/Disable cursorline. Default is 0. +" Enable/Disable cursorline. Default is 1, cursorline will be +" highlighted in normal mode.To disable this feature: " > -" let g:spacevim_enable_cursorline = 1 +" let g:spacevim_enable_cursorline = 0 " < -let g:spacevim_enable_cursorline = 0 +let g:spacevim_enable_cursorline = 1 +"" +" Enable/Disable cursorcolumn. Default is 1, cursorcolumn will be +" highlighted in normal mode. To disable this feature: +" > +" let g:spacevim_enable_cursorcolumn = 0 +" < +let g:spacevim_enable_cursorcolumn = 1 "" " Set the error symbol for SpaceVim's syntax maker. Default is '✖'. " > diff --git a/autoload/SpaceVim/autocmds.vim b/autoload/SpaceVim/autocmds.vim index ddedbba6b..180299091 100644 --- a/autoload/SpaceVim/autocmds.vim +++ b/autoload/SpaceVim/autocmds.vim @@ -18,8 +18,14 @@ function! SpaceVim#autocmds#init() abort autocmd FileType jsp call JspFileTypeInit() autocmd FileType html,css,jsp EmmetInstall autocmd BufRead,BufNewFile *.pp setfiletype puppet - autocmd BufEnter,WinEnter,InsertLeave * set cursorline - autocmd BufLeave,WinLeave,InsertEnter * set nocursorline + if g:spacevim_enable_cursorline == 1 + autocmd BufEnter,WinEnter,InsertLeave * setl cursorline + autocmd BufLeave,WinLeave,InsertEnter * setl nocursorline + endif + if g:spacevim_enable_cursorcolumn == 1 + autocmd BufEnter,WinEnter,InsertLeave * setl cursorcolumn + autocmd BufLeave,WinLeave,InsertEnter * setl nocursorcolumn + endif autocmd BufReadPost * \ if line("'\"") > 0 && line("'\"") <= line("$") | \ exe "normal! g`\"" | diff --git a/config/general.vim b/config/general.vim index a2f87b7f9..e567b5613 100644 --- a/config/general.vim +++ b/config/general.vim @@ -14,12 +14,6 @@ if count(g:spacevim_plugin_groups, 'colorscheme') && g:spacevim_colorscheme !=# else exec 'colorscheme '. g:spacevim_colorscheme_default endif -if g:spacevim_enable_cursorline == 1 - set cursorline "显示当前行 -endif -if g:spacevim_enable_cursorcolumn == 1 - set cursorcolumn "显示当前列 -endif if g:spacevim_hiddenfileinfo == 1 && has('patch-7.4.1570') set shortmess=filnxtToOFs endif diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index 0addf457c..c4004f307 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -154,9 +154,17 @@ ultisnips: < *g:spacevim_enable_cursorline* -Enable/Disable cursorline. Default is 0. +Enable/Disable cursorline. Default is 1, cursorline will be highlighted in +normal mode.To disable this feature: > - let g:spacevim_enable_cursorline = 1 + let g:spacevim_enable_cursorline = 0 +< + + *g:spacevim_enable_cursorcolumn* +Enable/Disable cursorcolumn. Default is 1, cursorcolumn will be highlighted in +normal mode. To disable this feature: +> + let g:spacevim_enable_cursorcolumn = 0 < *g:spacevim_error_symbol*