summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-01-12 15:46:08 +0100
committerBram Moolenaar <Bram@vim.org>2020-01-12 15:46:08 +0100
commit9b24dfcb9f676e7f7a09a9062f0d05b2104a87eb (patch)
tree8537a905d704980fa633385746376b1267618f07
parent02ad46394e8f887b60fda994f8a5da2ac1937b23 (diff)
patch 8.2.0113: "make cmdidxs" failsv8.2.0113
Problem: "make cmdidxs" fails. Solution: Allow address for ":cquit". Add --not-a-term to avoid a delay.
-rw-r--r--src/Make_cyg_ming.mak2
-rw-r--r--src/Make_mvc.mak2
-rw-r--r--src/Makefile2
-rw-r--r--src/ex_cmds.h2
-rw-r--r--src/version.c2
5 files changed, 6 insertions, 4 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index f9c795bfef..f89d8dd366 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1085,7 +1085,7 @@ endif
# If this fails because you don't have Vim yet, first build and install Vim
# without changes.
cmdidxs: ex_cmds.h
- vim --clean -X -u create_cmdidxs.vim
+ vim --clean -X --not-a-term -u create_cmdidxs.vim
###########################################################################
INCL = vim.h alloc.h ascii.h ex_cmds.h feature.h globals.h \
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index eb71296146..5704eac0f0 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1417,7 +1417,7 @@ clean: testclean
# If this fails because you don't have Vim yet, first build and install Vim
# without changes.
cmdidxs: ex_cmds.h
- vim --clean -X -u create_cmdidxs.vim
+ vim --clean -X --not-a-term -u create_cmdidxs.vim
test:
cd testdir
diff --git a/src/Makefile b/src/Makefile
index 1c7094098e..08a3277543 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2064,7 +2064,7 @@ autoconf:
# If this fails because you don't have Vim yet, first build and install Vim
# without changes.
cmdidxs: ex_cmds.h
- vim --clean -X -u create_cmdidxs.vim
+ vim --clean -X --not-a-term -u create_cmdidxs.vim
# The normal command to compile a .c file to its .o file.
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 928b1100d8..36a8ad4c2c 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -408,7 +408,7 @@ EXCMD(CMD_cpfile, "cpfile", ex_cnext,
ADDR_OTHER),
EXCMD(CMD_cquit, "cquit", ex_cquit,
EX_RANGE|EX_COUNT|EX_ZEROR|EX_TRLBAR|EX_BANG,
- ADDR_NONE),
+ ADDR_UNSIGNED),
EXCMD(CMD_crewind, "crewind", ex_cc,
EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG,
ADDR_UNSIGNED),
diff --git a/src/version.c b/src/version.c
index 508db61ef0..ba4fa7f7e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 113,
+/**/
112,
/**/
111,