mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.1.0226: too many #ifdefs
Problem: Too many #ifdefs. Solution: Graduate the +vreplace feature, it's not much code and quite a few #ifdefs.
This commit is contained in:
10
src/normal.c
10
src/normal.c
@@ -111,9 +111,7 @@ static void nv_findpar(cmdarg_T *cap);
|
||||
static void nv_undo(cmdarg_T *cap);
|
||||
static void nv_kundo(cmdarg_T *cap);
|
||||
static void nv_Replace(cmdarg_T *cap);
|
||||
#ifdef FEAT_VREPLACE
|
||||
static void nv_vreplace(cmdarg_T *cap);
|
||||
#endif
|
||||
static void v_swap_corners(int cmdchar);
|
||||
static void nv_replace(cmdarg_T *cap);
|
||||
static void n_swapchar(cmdarg_T *cap);
|
||||
@@ -7300,7 +7298,6 @@ nv_Replace(cmdarg_T *cap)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef FEAT_VREPLACE
|
||||
/*
|
||||
* "gr".
|
||||
*/
|
||||
@@ -7323,15 +7320,14 @@ nv_vreplace(cmdarg_T *cap)
|
||||
cap->extra_char = get_literal();
|
||||
stuffcharReadbuff(cap->extra_char);
|
||||
stuffcharReadbuff(ESC);
|
||||
# ifdef FEAT_VIRTUALEDIT
|
||||
#ifdef FEAT_VIRTUALEDIT
|
||||
if (virtual_active())
|
||||
coladvance(getviscol());
|
||||
# endif
|
||||
#endif
|
||||
invoke_edit(cap, TRUE, 'v', FALSE);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Swap case for "~" command, when it does not work like an operator.
|
||||
@@ -7944,7 +7940,6 @@ nv_g_cmd(cmdarg_T *cap)
|
||||
clearopbeep(oap);
|
||||
break;
|
||||
|
||||
#ifdef FEAT_VREPLACE
|
||||
/*
|
||||
* "gR": Enter virtual replace mode.
|
||||
*/
|
||||
@@ -7956,7 +7951,6 @@ nv_g_cmd(cmdarg_T *cap)
|
||||
case 'r':
|
||||
nv_vreplace(cap);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case '&':
|
||||
do_cmdline_cmd((char_u *)"%s//~/&");
|
||||
|
Reference in New Issue
Block a user