patch 8.1.2422: "make depend" does not work correctly for libvterm
Problem: "make depend" does not work correctly for libvterm.
Solution: Fix build dependencies. And a few minor improvements.
diff --git a/src/Makefile b/src/Makefile
index 1fe94f5..52f7925 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1702,8 +1702,8 @@
RUN_UNITTESTS = run_json_test run_kword_test run_memfile_test run_message_test
# All sources, also the ones that are not configured
-ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) \
- $(EXTRA_SRC) $(TERM_SRC) $(XDIFF_SRC)
+ALL_LOCAL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) $(EXTRA_SRC)
+ALL_SRC = $(ALL_LOCAL_SRC) $(TERM_SRC) $(XDIFF_SRC)
# 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.
@@ -2971,7 +2971,13 @@
-@rm -f Makefile~
cp Makefile Makefile~
sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make
- -for i in $(ALL_SRC); do echo $$i; \
+ -for i in $(ALL_LOCAL_SRC); do echo $$i; \
+ $(CPP_DEPEND) $$i | \
+ sed -e 's+^\([^ ]*\.o\)+objects/\1+' >> tmp_make; done
+ -for i in $(TERM_SRC); do echo $$i; \
+ $(CPP_DEPEND) $$i | \
+ sed -e 's+^\([^ ]*\.o\)+objects/vterm_\1+' >> tmp_make; done
+ -for i in $(XDIFF_SRC); do echo $$i; \
$(CPP_DEPEND) $$i | \
sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+xdiff/\.\./++g' >> tmp_make; done
mv tmp_make Makefile
@@ -3654,7 +3660,7 @@
objects/diff.o: diff.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 xdiff/xdiff.h vim.h
+ proto.h globals.h xdiff/xdiff.h xdiff/../vim.h
objects/digraph.o: digraph.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 \
@@ -4103,27 +4109,27 @@
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h
objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
-objects/encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \
+objects/vterm_encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/encoding/DECdrawing.inc libvterm/src/encoding/uk.inc
-objects/keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \
+objects/vterm_keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/utf8.h
-objects/mouse.o: libvterm/src/mouse.c libvterm/src/vterm_internal.h \
+objects/vterm_mouse.o: libvterm/src/mouse.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/utf8.h
-objects/parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \
+objects/vterm_parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
-objects/pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \
+objects/vterm_pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
-objects/screen.o: libvterm/src/screen.c libvterm/src/vterm_internal.h \
+objects/vterm_screen.o: libvterm/src/screen.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/rect.h libvterm/src/utf8.h
-objects/state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \
+objects/vterm_state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
-objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \
+objects/vterm_unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
-objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \
+objects/vterm_vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/utf8.h
objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \
diff --git a/src/filepath.c b/src/filepath.c
index 0fc1a5c..01d2dcb 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -8,7 +8,7 @@
*/
/*
- * filepath.c: dealing with file names ant paths.
+ * filepath.c: dealing with file names and paths.
*/
#include "vim.h"
diff --git a/src/insexpand.c b/src/insexpand.c
index 4f96174..ce2cc72 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -32,7 +32,7 @@
# define CTRL_X_DICTIONARY (9 + CTRL_X_WANT_IDENT)
# define CTRL_X_THESAURUS (10 + CTRL_X_WANT_IDENT)
# define CTRL_X_CMDLINE 11
-# define CTRL_X_FUNCTION 12
+# define CTRL_X_FUNCTION 12
# define CTRL_X_OMNI 13
# define CTRL_X_SPELL 14
# define CTRL_X_LOCAL_MSG 15 /* only used in "ctrl_x_msgs" */
diff --git a/src/main.c b/src/main.c
index ddb8e38..72e51a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2939,10 +2939,10 @@
}
}
- /*
- * If opened more than one window, start editing files in the other
- * windows. make_windows() has already opened the windows.
- */
+/*
+ * If opened more than one window, start editing files in the other
+ * windows. make_windows() has already opened the windows.
+ */
static void
edit_buffers(
mparm_T *parmp,
diff --git a/src/version.c b/src/version.c
index 340867d..d9e47ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2422,
+/**/
2421,
/**/
2420,