patch 8.0.1098: build failure if libvterm installed
Problem: Build failure if libvterm installed on the system. (Oleh
Hushchenkov)
Solution: Change the CCCTERM argument order. (Ken Takata, closes #2080)
diff --git a/src/Makefile b/src/Makefile
index 0cb0058..247fee6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3299,7 +3299,7 @@
Makefile:
@echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
-CCCTERM = $(CCC) -Ilibvterm/include -DINLINE="" \
+CCCTERM = $(CCC_NF) -Ilibvterm/include $(ALL_CFLAGS) -DINLINE="" \
-DVSNPRINTF=vim_vsnprintf \
-DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
-DWCWIDTH_FUNCTION=utf_uint2cells
diff --git a/src/version.c b/src/version.c
index b7adf03..346d201 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1098,
+/**/
1097,
/**/
1096,