Patch 8.1.2422

[Bram Moolenaar]

Patch 8.1.2422
Problem: "make depend" does not work correctly for libvterm.
Solution: Fix build dependencies. And a few minor improvements.
Files: src/Makefile, src/filepath.c, src/insexpand.c, src/main.c


*** ../vim-8.1.2421/src/Makefile 2019-12-11 21:08:16.829871908 +0100
--- src/Makefile 2019-12-11 21:17:43.512606807 +0100
***************
*** 1702,1709 ****
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)

# 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.
--- 1702,1709 ----
RUN_UNITTESTS = run_json_test run_kword_test run_memfile_test run_message_test

# All sources, also the ones that are not configured
! 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,2977 ****
-@rm -f Makefile~
cp Makefile Makefile~
sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make
! -for i in $(ALL_SRC); do echo $$i; \
$(CPP_DEPEND) $$i | \
sed -e 's+^\([^ ]*\.o\)+objects/\1+' -e 's+xdiff/\.\./++g' >> tmp_make; done
mv tmp_make Makefile
--- 2971,2983 ----
-@rm -f Makefile~
cp Makefile Makefile~
sed -e '/\#\#\# Dependencies/q' < Makefile > tmp_make
! -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,3660 ****
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
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 \
--- 3660,3666 ----
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 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,4129 ****
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 \
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 \
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 \
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 \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
! objects/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 \
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 \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
! objects/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 \
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 \
--- 4109,4135 ----
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/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/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/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/vterm_parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
! objects/vterm_pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.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/vterm_state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.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_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 \
*** ../vim-8.1.2421/src/filepath.c 2019-12-01 21:41:24.481837827 +0100
--- src/filepath.c 2019-12-08 20:49:06.645665944 +0100
***************
*** 8,14 ****
*/

/*
! * filepath.c: dealing with file names ant paths.
*/

#include "vim.h"
--- 8,14 ----
*/

/*
! * filepath.c: dealing with file names and paths.
*/

#include "vim.h"
*** ../vim-8.1.2421/src/insexpand.c 2019-11-30 22:47:42.651331201 +0100
--- src/insexpand.c 2019-12-10 21:17:33.224354039 +0100
***************
*** 32,38 ****
# 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_OMNI 13
# define CTRL_X_SPELL 14
# define CTRL_X_LOCAL_MSG 15 /* only used in "ctrl_x_msgs" */
--- 32,38 ----
# 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_OMNI 13
# define CTRL_X_SPELL 14
# define CTRL_X_LOCAL_MSG 15 /* only used in "ctrl_x_msgs" */
*** ../vim-8.1.2421/src/main.c 2019-12-04 21:57:40.072408373 +0100
--- src/main.c 2019-12-09 23:00:49.201713326 +0100
***************
*** 2939,2948 ****
}
}

! /*
! * 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,
--- 2939,2948 ----
}
}

! /*
! * 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,
*** ../vim-8.1.2421/src/version.c 2019-12-11 20:12:11.754579063 +0100
--- src/version.c 2019-12-11 21:19:25.484382822 +0100
***************
*** 744,745 ****
--- 744,747 ----
{ /* Add new patch number below this line */
+ /**/
+ 2422,
/**/

--
hundred-and-one symptoms of being an internet addict:
253. You wait for a slow loading web page before going to the toilet.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///