patch 8.1.0826: too many #ifdefs
Problem: Too many #ifdefs.
Solution: Graduate FEAT_VIRTUALEDIT. Adds about 10Kbyte to the code.
diff --git a/src/mbyte.c b/src/mbyte.c
index faeebfd..aa10d5e 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -3994,9 +3994,7 @@
convert_setup(&vimconv, p_enc, curbuf->b_p_fenc);
}
-#ifdef FEAT_VIRTUALEDIT
curwin->w_cursor.coladd = 0;
-#endif
for (;;)
{
p = ml_get_cursor();
@@ -4118,18 +4116,13 @@
{
char_u *p;
- if (lp->col > 0
-#ifdef FEAT_VIRTUALEDIT
- || lp->coladd > 1
-#endif
- )
+ if (lp->col > 0 || lp->coladd > 1)
{
p = ml_get_buf(buf, lp->lnum, FALSE);
if (*p == NUL || (int)STRLEN(p) < lp->col)
lp->col = 0;
else
lp->col -= (*mb_head_off)(p, p + lp->col);
-#ifdef FEAT_VIRTUALEDIT
/* Reset "coladd" when the cursor would be on the right half of a
* double-wide character. */
if (lp->coladd == 1
@@ -4137,7 +4130,6 @@
&& vim_isprintc((*mb_ptr2char)(p + lp->col))
&& ptr2cells(p + lp->col) > 1)
lp->coladd = 0;
-#endif
}
}