diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-01-11 14:37:20 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-01-11 14:37:20 +0100 |
commit | 870ba5f6dce974b6c1c47bf9d3b20db805d10b36 (patch) | |
tree | 270e22e4affea836091d30ce0166fa1ad649ff92 /src/normal.c | |
parent | 402385a7f2fed23acef7ad3ce75252706b1d7606 (diff) | |
download | vim-git-870ba5f6dce974b6c1c47bf9d3b20db805d10b36.tar.gz |
patch 8.1.0719: too many #ifdefsv8.1.0719
Problem: Too many #ifdefs.
Solution: Always build with the +visualextra feature.
Diffstat (limited to 'src/normal.c')
-rw-r--r-- | src/normal.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/normal.c b/src/normal.c index 2688bf9f5..9ee0eeffb 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1998,7 +1998,6 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) case OP_INSERT: case OP_APPEND: VIsual_reselect = FALSE; /* don't reselect now */ -#ifdef FEAT_VISUALEXTRA if (empty_region_error) { vim_beep(BO_OPER); @@ -2035,24 +2034,18 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) else cap->retval |= CA_COMMAND_BUSY; } -#else - vim_beep(BO_OPER); -#endif break; case OP_REPLACE: VIsual_reselect = FALSE; /* don't reselect now */ -#ifdef FEAT_VISUALEXTRA if (empty_region_error) -#endif { vim_beep(BO_OPER); CancelRedo(); } -#ifdef FEAT_VISUALEXTRA else { -# ifdef FEAT_LINEBREAK +#ifdef FEAT_LINEBREAK /* Restore linebreak, so that when the user edits it looks as * before. */ if (curwin->w_p_lbr != lbr_saved) @@ -2060,10 +2053,9 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) curwin->w_p_lbr = lbr_saved; get_op_vcol(oap, redo_VIsual_mode, FALSE); } -# endif +#endif op_replace(oap, cap->nchar); } -#endif break; #ifdef FEAT_FOLDING |