patch 7.4.1241
Problem: Missing change in Makefile due to diff mismatch
Solution: Update the list of object files.
diff --git a/src/Makefile b/src/Makefile
index 31664b6..93a8898 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1591,7 +1591,7 @@
objects/if_cscope.o \
objects/if_xcmdsrv.o \
objects/mark.o \
- objects/memline.o \
+ objects/memline.o \
objects/menu.o \
objects/message.o \
objects/misc1.o \
@@ -1633,11 +1633,17 @@
$(WSDEBUG_OBJ)
OBJ = $(OBJ_COMMON) \
+ objects/json.o \
objects/main.o \
objects/memfile.o
+JSON_TEST_OBJ = $(OBJ_COMMON) \
+ objects/json_test.o \
+ objects/memfile.o
+
MEMFILE_TEST_OBJ = $(OBJ_COMMON) \
- objects/memfile_test.o
+ objects/json.o \
+ objects/memfile_test.o
PRO_AUTO = \
blowfish.pro \
diff --git a/src/version.c b/src/version.c
index 712377a..39090d4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1241,
+/**/
1240,
/**/
1239,
