updated for version 7.4.212
Problem: Now that the +visual feature is always enabled the #ifdefs for it
are not useful.
Solution: Remove the checks for FEAT_VISUAL.
diff --git a/src/misc2.c b/src/misc2.c
index 8f8b2d9..a20337f 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -31,9 +31,7 @@
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 @@
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 @@
* - 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 @@
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 @@
{
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 @@
}
if (finish_op)
return SHAPE_IDX_O;
-#ifdef FEAT_VISUAL
if (VIsual_active)
{
if (*p_sel == 'e')
@@ -3746,7 +3734,6 @@
else
return SHAPE_IDX_V;
}
-#endif
return SHAPE_IDX_N;
}
#endif