diff options
Diffstat (limited to 'src/misc2.c')
| -rw-r--r-- | src/misc2.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/misc2.c b/src/misc2.c index 8f8b2d9d46..a20337f48c 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -31,9 +31,7 @@ virtual_active() if (virtual_op != MAYBE) return virtual_op; return (ve_flags == VE_ALL -# ifdef FEAT_VISUAL || ((ve_flags & VE_BLOCK) && VIsual_active && VIsual_mode == Ctrl_V) -# endif || ((ve_flags & VE_INSERT) && (State & INSERT))); } @@ -149,9 +147,7 @@ coladvance2(pos, addspaces, finetune, wcol) one_more = (State & INSERT) || restart_edit != NUL -#ifdef FEAT_VISUAL || (VIsual_active && *p_sel != 'o') -#endif #ifdef FEAT_VIRTUALEDIT || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL) #endif @@ -570,9 +566,7 @@ check_cursor_col_win(win) * - in Visual mode and 'selection' isn't "old" * - 'virtualedit' is set */ if ((State & INSERT) || restart_edit -#ifdef FEAT_VISUAL || (VIsual_active && *p_sel != 'o') -#endif #ifdef FEAT_VIRTUALEDIT || (ve_flags & VE_ONEMORE) #endif @@ -627,9 +621,7 @@ check_cursor() adjust_cursor_col() { if (curwin->w_cursor.col > 0 -# ifdef FEAT_VISUAL && (!VIsual_active || *p_sel == 'o') -# endif && gchar_cursor() == NUL) --curwin->w_cursor.col; } @@ -3290,17 +3282,14 @@ get_real_state() { if (State & NORMAL) { -#ifdef FEAT_VISUAL if (VIsual_active) { if (VIsual_select) return SELECTMODE; return VISUAL; } - else -#endif - if (finish_op) - return OP_PENDING; + else if (finish_op) + return OP_PENDING; } return State; } @@ -3738,7 +3727,6 @@ get_shape_idx(mouse) } if (finish_op) return SHAPE_IDX_O; -#ifdef FEAT_VISUAL if (VIsual_active) { if (*p_sel == 'e') @@ -3746,7 +3734,6 @@ get_shape_idx(mouse) else return SHAPE_IDX_V; } -#endif return SHAPE_IDX_N; } #endif |