summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-02-19 16:00:16 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-19 16:00:16 +0000
commitd56eb654f50434ea590142c0f080efba91bfe7f8 (patch)
tree24bbcb7129e43d1d4386f9007d9a25696d255fd9
parentadbb383e0f2bb59286ea8133f02c448fd334958f (diff)
downloadvim-git-d56eb654f50434ea590142c0f080efba91bfe7f8.tar.gz
patch 8.2.4423: "make nvcmdidxs" failsv8.2.4423
Problem: "make nvcmdidxs" fails. Solution: Use "-S" instead of "-u" to source the script.
-rw-r--r--src/Makefile6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 0874b0aef..8b0b26878 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2140,7 +2140,7 @@ autoconf:
# without changes.
# This requires a "vim" executable with the +eval feature.
cmdidxs: ex_cmds.h
- vim --clean -X --not-a-term -u create_cmdidxs.vim -c quit
+ vim --clean -X --not-a-term -S create_cmdidxs.vim -c quit
# Run vim script to generate the normal/visual mode command lookup table.
# This only needs to be run when a new normal/visual mode command has been
@@ -2151,7 +2151,7 @@ cmdidxs: ex_cmds.h
# - run "make nvcmdidxs" to generate nv_cmdidxs.h
nvcmdidxs: auto/config.mk nv_cmds.h
$(CC) -I$(srcdir) $(ALL_CFLAGS) create_nvcmdidxs.c -o create_nvcmdidxs
- vim --clean -X --not-a-term -u create_nvcmdidxs.vim -c quit
+ vim --clean -X --not-a-term -S create_nvcmdidxs.vim -c quit
-rm -f create_nvcmdidxs
# The normal command to compile a .c file to its .o file.
@@ -3030,7 +3030,7 @@ pixmaps:
# Update the synmenu.vim file with the latest Syntax menu.
# This is only needed when runtime/makemenu.vim was changed.
menu: ./vim ../runtime/makemenu.vim
- ./vim --clean -X --not-a-term -u ../runtime/makemenu.vim
+ ./vim --clean -X --not-a-term -S ../runtime/makemenu.vim
# Start configure from scratch
scrub scratch:
diff --git a/src/version.c b/src/version.c
index 2e3fa4fa0..7d585ba08 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4423,
+/**/
4422,
/**/
4421,