thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0747: too many #ifdefs

Browse Source 
Problem:    Too many #ifdefs.
Solution:   Gradudate the +cmdline_info feature. (Martin Tournoij,
            closes #11330)
This commit is contained in:
Martin Tournoij
2022-10-13 22:12:15 +01:00
committed by Bram Moolenaar
parent 856c5d2bc7
commit ba43e76fcd
25 changed files with 40 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/screen.c
View File

@@ -4420,7 +4420,6 @@ showmode(void)
msg_clr_eos();
}
#ifdef FEAT_CMDL_INFO
// In Visual mode the size of the selected area must be redrawn.
if (VIsual_active)
clear_showcmd();
@@ -4429,7 +4428,7 @@ showmode(void)
// message and must be redrawn
if (redrawing() && lastwin->w_status_height == 0)
win_redr_ruler(lastwin, TRUE, FALSE);
#endif
redraw_cmdline = FALSE;
redraw_mode = FALSE;
clear_cmdline = FALSE;
@@ -4790,18 +4789,17 @@ messaging(void)
void
comp_col(void)
{
#if defined(FEAT_CMDL_INFO)
int last_has_status = (p_ls == 2 || (p_ls == 1 && !ONE_WINDOW));
sc_col = 0;
ru_col = 0;
if (p_ru)
{
# ifdef FEAT_STL_OPT
#ifdef FEAT_STL_OPT
ru_col = (ru_wid ? ru_wid : COL_RULER) + 1;
# else
#else
ru_col = COL_RULER + 1;
# endif
#endif
// no last status line, adjust sc_col
if (!last_has_status)
sc_col = ru_col;
@@ -4818,10 +4816,6 @@ comp_col(void)
sc_col = 1;
if (ru_col <= 0)
ru_col = 1;
#else
sc_col = Columns;
ru_col = Columns;
#endif
#ifdef FEAT_EVAL
set_vim_var_nr(VV_ECHOSPACE, sc_col - 1);
#endif