updated for version 7.2-281

diff --git a/src/screen.c b/src/screen.c
index 7570b6f11cc98da94d4aab5e362dc578a9e08fad..b7107b62577aa47cbcc909a49919c3618fd467d7 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -3008,11 +3008,33 @@ win_line(wp, lnum, startrow, endrow, nochange)
            mb_ptr_adv(ptr);
        }
 
-#ifdef FEAT_VIRTUALEDIT
-       /* When 'virtualedit' is set the end of the line may be before the
-        * start of the displayed part. */
-       if (vcol < v && *ptr == NUL && virtual_active())
+#if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
+       /* When:
+        * - 'cuc' is set, or
+        * - 'virtualedit' is set, or
+        * - the visual mode is active,
+        * the end of the line may be before the start of the displayed part.
+        */
+       if (vcol < v && (
+# ifdef FEAT_SYN_HL
+            wp->w_p_cuc
+#  if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL)
+            ||
+#  endif
+# endif
+# ifdef FEAT_VIRTUALEDIT
+            virtual_active()
+#  ifdef FEAT_VISUAL
+            ||
+#  endif
+# endif
+# ifdef FEAT_VISUAL
+            (VIsual_active && wp->w_buffer == curwin->w_buffer)
+# endif
+            ))
+       {
            vcol = v;
+       }
 #endif
 
        /* Handle a character that's not completely on the screen: Put ptr at

diff --git a/src/version.c b/src/version.c
index a4214fc96f523dfae64c98429095662c073d3a4d..e6b9056a8104bf172c8884d2c2a7c1e2c076dec9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    281,
 /**/
     280,
 /**/