patch 8.2.4094: 'virtualedit' is window-local but using buffer-local enum

Problem:    'virtualedit' is window-local but using buffer-local enum.
Solution:   Use window-local enum. (closes #9529)

diff --git a/src/option.h b/src/option.h
index 00a2d2ecc4aa3807e685c6c04508bad3b4cc1897..c9b63f7385494dd355f9da819cbe3de6c621b10e 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -1235,7 +1235,6 @@ enum
     , BV_VSTS
     , BV_VTS
 #endif
-    , BV_VE
     , BV_COUNT     // must be the last one
 };
 
@@ -1287,6 +1286,7 @@ enum
 #endif
     , WV_NU
     , WV_RNU
+    , WV_VE
 #ifdef FEAT_LINEBREAK
     , WV_NUW
 #endif

diff --git a/src/optiondefs.h b/src/optiondefs.h
index cc4ad9e57e684e6f051a22723dfabc16b689f855..81d513cd615cfe86d5fed358b6b3444e58b755b5 100644 (file)
--- a/src/optiondefs.h
+++ b/src/optiondefs.h
@@ -156,7 +156,6 @@
 # define PV_VSTS               OPT_BUF(BV_VSTS)
 # define PV_VTS                OPT_BUF(BV_VTS)
 #endif
-#define PV_VE          OPT_BOTH(OPT_BUF(BV_VE))
 
 // Definition of the PV_ values for window-local options.
 // The WV_ values are defined in option.h.
@@ -192,6 +191,7 @@
 #define PV_LCS         OPT_BOTH(OPT_WIN(WV_LCS))
 #define PV_NU          OPT_WIN(WV_NU)
 #define PV_RNU         OPT_WIN(WV_RNU)
+#define PV_VE          OPT_BOTH(OPT_WIN(WV_VE))
 #ifdef FEAT_LINEBREAK
 # define PV_NUW                OPT_WIN(WV_NUW)
 #endif

diff --git a/src/version.c b/src/version.c
index 5869c2694a6a00afdfef0cbf221a3d33fe72ad07..e62c69dfce9f3b6d9a9b44f683440020f83c1e29 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4094,
 /**/
     4093,
 /**/