diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-07-29 16:09:22 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-07-29 16:09:22 +0200 |
| commit | 1f0bfe561737cd445532f20d7607a81d1dadddee (patch) | |
| tree | 7328a946135589dc8e69e2e4ff34afbd18be2e77 /src/normal.c | |
| parent | 612cc3888b136e80485132d9f997ed457dbc5501 (diff) | |
| download | vim-git-1f0bfe561737cd445532f20d7607a81d1dadddee.tar.gz | |
patch 8.1.0226: too many #ifdefsv8.1.0226
Problem: Too many #ifdefs.
Solution: Graduate the +vreplace feature, it's not much code and quite a few
#ifdefs.
Diffstat (limited to 'src/normal.c')
| -rw-r--r-- | src/normal.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/normal.c b/src/normal.c index 4e36d5607..f3cd664a6 100644 --- a/src/normal.c +++ b/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//~/&"); |