summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-01-15 10:52:16 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-15 10:52:16 +0000
commite1833bfd01c100896d2a01f281762c285192d84b (patch)
tree1745806541f0e04a30c1659405c74dfa258c1ad9
parentc53b467473160b5cfce77277fbae414bf43e66ce (diff)
patch 8.2.4094: 'virtualedit' is window-local but using buffer-local enumv8.2.4094
Problem: 'virtualedit' is window-local but using buffer-local enum. Solution: Use window-local enum. (closes #9529)
-rw-r--r--src/option.h2
-rw-r--r--src/optiondefs.h2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/option.h b/src/option.h
index 00a2d2ecc4..c9b63f7385 100644
--- 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 cc4ad9e57e..81d513cd61 100644
--- 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 5869c2694a..e62c69dfce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4094,
+/**/
4093,
/**/
4092,