patch 7.4.1170
Problem: Missing changes in src/Makefile, Filelist.
Solution: Add the missing changes.
diff --git a/Filelist b/Filelist
index 0032b76..89fd059 100644
--- a/Filelist
+++ b/Filelist
@@ -13,6 +13,7 @@
src/ascii.h \
src/blowfish.c \
src/buffer.c \
+ src/channel.c \
src/charset.c \
src/crypt.c \
src/crypt_zip.c \
@@ -39,8 +40,8 @@
src/gui_beval.h \
src/hardcopy.c \
src/hashtab.c \
- src/keymap.h \
src/json.c \
+ src/keymap.h \
src/macros.h \
src/main.c \
src/mark.c \
@@ -114,6 +115,7 @@
src/proto.h \
src/proto/blowfish.pro \
src/proto/buffer.pro \
+ src/proto/channel.pro \
src/proto/charset.pro \
src/proto/crypt.pro \
src/proto/crypt_zip.pro \
diff --git a/src/Makefile b/src/Makefile
index 91f3b77..f834c2b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -462,6 +462,10 @@
# Uncomment this when you do not want the netbeans interface.
#CONF_OPT_NETBEANS = --disable-netbeans
+# CHANNEL - inter process communication. Same conditions as NetBeans.
+# Uncomment this when you do not want inter process communication.
+#CONF_OPT_CHANNEL = --disable-channel
+
# SNIFF - Include support for SNiFF+.
#CONF_OPT_SNIFF = --enable-sniff
@@ -1536,7 +1540,8 @@
EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
if_python.c if_python3.c if_tcl.c if_ruby.c if_sniff.c \
- gui_beval.c workshop.c wsdebug.c integration.c netbeans.c \
+ gui_beval.c workshop.c wsdebug.c integration.c \
+ netbeans.c channel.c \
$(GRESOURCE_SRC)
# Unittest files
@@ -1552,8 +1557,10 @@
# Which files to check with lint. Select one of these three lines. ALL_SRC
# checks more, but may not work well for checking a GUI that wasn't configured.
# The perl sources also don't work well with lint.
-LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) $(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \
- $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) $(NETBEANS_SRC)
+LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) \
+ $(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \
+ $(SNIFF_SRC) $(WORKSHOP_SRC) $(WSDEBUG_SRC) \
+ $(NETBEANS_SRC) $(CHANNEL_SRC)
#LINT_SRC = $(SRC)
#LINT_SRC = $(ALL_SRC)
#LINT_SRC = $(BASIC_SRC)
@@ -1621,6 +1628,7 @@
$(OS_EXTRA_OBJ) \
$(WORKSHOP_OBJ) \
$(NETBEANS_OBJ) \
+ $(CHANNEL_OBJ) \
$(WSDEBUG_OBJ)
OBJ = $(OBJ_COMMON) \
@@ -1689,6 +1697,7 @@
gui_beval.pro \
workshop.pro \
netbeans.pro \
+ channel.pro \
$(ALL_GUI_PRO) \
$(TCL_PRO)
@@ -1731,7 +1740,8 @@
$(CONF_OPT_CSCOPE) $(CONF_OPT_MULTIBYTE) $(CONF_OPT_INPUT) \
$(CONF_OPT_OUTPUT) $(CONF_OPT_GPM) $(CONF_OPT_WORKSHOP) \
$(CONF_OPT_SNIFF) $(CONF_OPT_FEAT) $(CONF_TERM_LIB) \
- $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \
+ $(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \
+ $(CONF_OPT_CHANNEL) \
$(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
$(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
$(CONF_OPT_SYSMOUSE); \
@@ -2896,6 +2906,9 @@
objects/netbeans.o: netbeans.c
$(CCC) -o $@ netbeans.c
+objects/channel.o: channel.c
+ $(CCC) -o $@ channel.c
+
Makefile:
@echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
@@ -3337,3 +3350,7 @@
auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
globals.h farsi.h arabic.h version.h
+objects/channel.o: channel.c vim.h auto/config.h feature.h os_unix.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+ globals.h farsi.h arabic.h version.h
diff --git a/src/version.c b/src/version.c
index 61bc284..c23858e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1170,
+/**/
1169,
/**/
1168,