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

10
src/option.c
View File

@@ -3931,7 +3931,7 @@ findoption(char_u *arg)
return opt_idx;
}
#if defined(FEAT_EVAL) || defined(FEAT_TCL) || defined(FEAT_MZSCHEME)
#if defined(FEAT_EVAL) || defined(FEAT_TCL) || defined(FEAT_MZSCHEME) || defined(FEAT_SPELL)
/*
* Get the value for an option.
*
@@ -6851,9 +6851,7 @@ paste_option_changed(void)
static int old_p_paste = FALSE;
static int save_sm = 0;
static int save_sta = 0;
#ifdef FEAT_CMDL_INFO
static int save_ru = 0;
#endif
#ifdef FEAT_RIGHTLEFT
static int save_ri = 0;
static int save_hkmap = 0;
@@ -6887,9 +6885,7 @@ paste_option_changed(void)
// save global options
save_sm = p_sm;
save_sta = p_sta;
#ifdef FEAT_CMDL_INFO
save_ru = p_ru;
#endif
#ifdef FEAT_RIGHTLEFT
save_ri = p_ri;
save_hkmap = p_hkmap;
@@ -6930,11 +6926,9 @@ paste_option_changed(void)
// set global options
p_sm = 0; // no showmatch
p_sta = 0; // no smarttab
#ifdef FEAT_CMDL_INFO
if (p_ru)
status_redraw_all(); // redraw to remove the ruler
p_ru = 0; // no ruler
#endif
#ifdef FEAT_RIGHTLEFT
p_ri = 0; // no reverse insert
p_hkmap = 0; // no Hebrew keyboard
@@ -6980,11 +6974,9 @@ paste_option_changed(void)
// restore global options
p_sm = save_sm;
p_sta = save_sta;
#ifdef FEAT_CMDL_INFO
if (p_ru != save_ru)
status_redraw_all(); // redraw to draw the ruler
p_ru = save_ru;
#endif
#ifdef FEAT_RIGHTLEFT
p_ri = save_ri;
p_hkmap = save_hkmap;