thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.212

Browse Source 
Problem:    Now that the +visual feature is always enabled the #ifdefs for it
            are not useful.
Solution:   Remove the checks for FEAT_VISUAL.
This commit is contained in:
Bram Moolenaar
2014-03-23 15:13:05 +01:00
parent a687837516
commit f7ff6e85e8
39 changed files with 121 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/misc2.c
View File

@@ -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