patch 8.2.0149: maintaining a Vim9 branch separately is more work
Problem: Maintaining a Vim9 branch separately is more work.
Solution: Merge the Vim9 script changes.
diff --git a/src/Makefile b/src/Makefile
index 08a3277..912098f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1623,6 +1623,7 @@
main.c \
map.c \
mark.c \
+ mbyte.c \
memfile.c \
memline.c \
menu.c \
@@ -1631,7 +1632,6 @@
misc2.c \
mouse.c \
move.c \
- mbyte.c \
normal.c \
ops.c \
option.c \
@@ -1645,8 +1645,8 @@
quickfix.c \
regexp.c \
register.c \
- scriptfile.c \
screen.c \
+ scriptfile.c \
search.c \
session.c \
sha256.c \
@@ -1666,6 +1666,9 @@
usercmd.c \
userfunc.c \
version.c \
+ vim9compile.c \
+ vim9execute.c \
+ vim9script.c \
viminfo.c \
window.c \
bufwrite.c \
@@ -1761,13 +1764,13 @@
objects/list.o \
objects/map.o \
objects/mark.o \
+ objects/mbyte.o \
objects/memline.o \
objects/menu.o \
objects/misc1.o \
objects/misc2.o \
objects/mouse.o \
objects/move.o \
- objects/mbyte.o \
objects/normal.o \
objects/ops.o \
objects/option.o \
@@ -1781,8 +1784,8 @@
objects/quickfix.o \
objects/regexp.o \
objects/register.o \
- objects/scriptfile.o \
objects/screen.o \
+ objects/scriptfile.o \
objects/search.o \
objects/session.o \
objects/sha256.o \
@@ -1802,6 +1805,9 @@
objects/usercmd.o \
objects/userfunc.o \
objects/version.o \
+ objects/vim9compile.o \
+ objects/vim9execute.o \
+ objects/vim9script.o \
objects/viminfo.o \
objects/window.o \
objects/bufwrite.o \
@@ -1873,9 +1879,12 @@
arabic.pro \
arglist.pro \
autocmd.pro \
+ beval.pro \
blowfish.pro \
buffer.pro \
+ bufwrite.pro \
change.pro \
+ channel.pro \
charset.pro \
cindent.pro \
cmdexpand.pro \
@@ -1904,6 +1913,7 @@
findfile.pro \
fold.pro \
getchar.pro \
+ gui_beval.pro \
hardcopy.pro \
hashtab.pro \
highlight.pro \
@@ -1930,6 +1940,7 @@
misc2.pro \
mouse.pro \
move.pro \
+ netbeans.pro \
normal.pro \
ops.pro \
option.pro \
@@ -1943,8 +1954,8 @@
quickfix.pro \
regexp.pro \
register.pro \
- scriptfile.pro \
screen.pro \
+ scriptfile.pro \
search.pro \
session.pro \
sha256.pro \
@@ -1965,13 +1976,11 @@
usercmd.pro \
userfunc.pro \
version.pro \
+ vim9compile.pro \
+ vim9execute.pro \
+ vim9script.pro \
viminfo.pro \
window.pro \
- bufwrite.pro \
- beval.pro \
- gui_beval.pro \
- netbeans.pro \
- channel.pro \
$(ALL_GUI_PRO) \
$(TCL_PRO)
@@ -3079,6 +3088,9 @@
objects/buffer.o: buffer.c
$(CCC) -o $@ buffer.c
+objects/bufwrite.o: bufwrite.c
+ $(CCC) -o $@ bufwrite.c
+
objects/change.o: change.c
$(CCC) -o $@ change.c
@@ -3433,15 +3445,21 @@
objects/userfunc.o: userfunc.c
$(CCC) -o $@ userfunc.c
+objects/vim9compile.o: vim9compile.c
+ $(CCC) -o $@ vim9compile.c
+
+objects/vim9execute.o: vim9execute.c
+ $(CCC) -o $@ vim9execute.c
+
+objects/vim9script.o: vim9script.c
+ $(CCC) -o $@ vim9script.c
+
objects/viminfo.o: viminfo.c
$(CCC) -o $@ viminfo.c
objects/window.o: window.c
$(CCC) -o $@ window.c
-objects/bufwrite.o: bufwrite.c
- $(CCC) -o $@ bufwrite.c
-
objects/netbeans.o: netbeans.c
$(CCC) -o $@ netbeans.c
@@ -3787,6 +3805,10 @@
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h
+objects/mbyte.o: mbyte.c vim.h protodef.h auto/config.h feature.h os_unix.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h
objects/memfile.o: memfile.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
@@ -3819,10 +3841,6 @@
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h
-objects/mbyte.o: mbyte.c vim.h protodef.h auto/config.h feature.h os_unix.h \
- auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
- proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
- proto.h globals.h
objects/normal.o: normal.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
@@ -3875,14 +3893,14 @@
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h
-objects/scriptfile.o: scriptfile.c vim.h protodef.h auto/config.h feature.h \
- os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
- proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
- proto.h globals.h
objects/screen.o: screen.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h
+objects/scriptfile.o: scriptfile.c vim.h protodef.h auto/config.h feature.h \
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h
objects/search.o: search.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
@@ -3961,6 +3979,18 @@
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h version.h
+objects/vim9compile.o: vim9compile.c vim.h protodef.h auto/config.h feature.h \
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h vim9.h
+objects/vim9execute.o: vim9execute.c vim.h protodef.h auto/config.h feature.h \
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h vim9.h
+objects/vim9script.o: vim9script.c vim.h protodef.h auto/config.h feature.h \
+ os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
+ proto.h globals.h vim9.h
objects/viminfo.o: viminfo.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \