• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révisiondaac3cf65d7e4fb472a02b080814ffdd9620b085 (tree)
l'heure2022-01-15 20:00:03
AuteurBram Moolenaar <Bram@vim....>
CommiterBram Moolenaar

Message de Log

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

Commit: https://github.com/vim/vim/commit/e1833bfd01c100896d2a01f281762c285192d84b
Author: zeertzjq <zeertzjq@outlook.com>
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)

Change Summary

Modification

diff -r a4ef6b033e16 -r daac3cf65d7e src/option.h
--- a/src/option.h Sat Jan 15 11:15:05 2022 +0100
+++ b/src/option.h Sat Jan 15 12:00:03 2022 +0100
@@ -1235,7 +1235,6 @@
12351235 , BV_VSTS
12361236 , BV_VTS
12371237 #endif
1238- , BV_VE
12391238 , BV_COUNT // must be the last one
12401239 };
12411240
@@ -1287,6 +1286,7 @@
12871286 #endif
12881287 , WV_NU
12891288 , WV_RNU
1289+ , WV_VE
12901290 #ifdef FEAT_LINEBREAK
12911291 , WV_NUW
12921292 #endif
diff -r a4ef6b033e16 -r daac3cf65d7e src/optiondefs.h
--- a/src/optiondefs.h Sat Jan 15 11:15:05 2022 +0100
+++ b/src/optiondefs.h Sat Jan 15 12:00:03 2022 +0100
@@ -156,7 +156,6 @@
156156 # define PV_VSTS OPT_BUF(BV_VSTS)
157157 # define PV_VTS OPT_BUF(BV_VTS)
158158 #endif
159-#define PV_VE OPT_BOTH(OPT_BUF(BV_VE))
160159
161160 // Definition of the PV_ values for window-local options.
162161 // The WV_ values are defined in option.h.
@@ -192,6 +191,7 @@
192191 #define PV_LCS OPT_BOTH(OPT_WIN(WV_LCS))
193192 #define PV_NU OPT_WIN(WV_NU)
194193 #define PV_RNU OPT_WIN(WV_RNU)
194+#define PV_VE OPT_BOTH(OPT_WIN(WV_VE))
195195 #ifdef FEAT_LINEBREAK
196196 # define PV_NUW OPT_WIN(WV_NUW)
197197 #endif
diff -r a4ef6b033e16 -r daac3cf65d7e src/version.c
--- a/src/version.c Sat Jan 15 11:15:05 2022 +0100
+++ b/src/version.c Sat Jan 15 12:00:03 2022 +0100
@@ -751,6 +751,8 @@
751751 static int included_patches[] =
752752 { /* Add new patch number below this line */
753753 /**/
754+ 4094,
755+/**/
754756 4093,
755757 /**/
756758 4092,
Afficher sur ancien navigateur de dépôt.