# HG changeset patch # User Bram Moolenaar # Date 1642244403 -3600 # Node ID daac3cf65d7e4fb472a02b080814ffdd9620b085 # Parent a4ef6b033e1623338d77806f4e6f874361fd461c patch 8.2.4094: 'virtualedit' is window-local but using buffer-local enum Commit: https://github.com/vim/vim/commit/e1833bfd01c100896d2a01f281762c285192d84b Author: zeertzjq Date: Sat Jan 15 10:52:16 2022 +0000 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 https://github.com/vim/vim/issues/9529) diff --git a/src/option.h b/src/option.h --- 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 --- 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 --- 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,