Skip to content

Commit f05d2fc

Browse files
committed
patch 8.2.2956: Vim9: need to plan for future additions
Problem: Vim9: need to plan for future additions. Solution: Reserve commands for future use: :type, :class, :enum.
1 parent e729ce2 commit f05d2fc

3 files changed

Lines changed: 44 additions & 27 deletions

File tree

src/ex_cmdidxs.h

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@ static const unsigned short cmdidxs1[26] =
88
/* a */ 0,
99
/* b */ 19,
1010
/* c */ 43,
11-
/* d */ 109,
12-
/* e */ 134,
13-
/* f */ 158,
14-
/* g */ 175,
15-
/* h */ 181,
16-
/* i */ 190,
17-
/* j */ 209,
18-
/* k */ 211,
19-
/* l */ 216,
20-
/* m */ 279,
21-
/* n */ 297,
22-
/* o */ 317,
23-
/* p */ 329,
24-
/* q */ 368,
25-
/* r */ 371,
26-
/* s */ 391,
27-
/* t */ 460,
28-
/* u */ 505,
29-
/* v */ 516,
30-
/* w */ 537,
31-
/* x */ 551,
32-
/* y */ 561,
33-
/* z */ 562
11+
/* d */ 110,
12+
/* e */ 135,
13+
/* f */ 162,
14+
/* g */ 179,
15+
/* h */ 185,
16+
/* i */ 194,
17+
/* j */ 213,
18+
/* k */ 215,
19+
/* l */ 220,
20+
/* m */ 283,
21+
/* n */ 301,
22+
/* o */ 321,
23+
/* p */ 333,
24+
/* q */ 372,
25+
/* r */ 375,
26+
/* s */ 395,
27+
/* t */ 464,
28+
/* u */ 510,
29+
/* v */ 521,
30+
/* w */ 542,
31+
/* x */ 556,
32+
/* y */ 566,
33+
/* z */ 567
3434
};
3535

3636
/*
@@ -43,9 +43,9 @@ static const unsigned char cmdidxs2[26][26] =
4343
{ /* a b c d e f g h i j k l m n o p q r s t u v w x y z */
4444
/* a */ { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 5, 6, 0, 0, 0, 7, 15, 0, 16, 0, 0, 0, 0, 0 },
4545
/* b */ { 2, 0, 0, 5, 6, 8, 0, 0, 0, 0, 0, 9, 10, 11, 12, 13, 0, 14, 0, 0, 0, 0, 23, 0, 0, 0 },
46-
/* c */ { 3, 12, 16, 18, 20, 22, 25, 0, 0, 0, 0, 33, 37, 40, 46, 56, 58, 59, 60, 0, 62, 0, 65, 0, 0, 0 },
46+
/* c */ { 3, 12, 16, 18, 20, 22, 25, 0, 0, 0, 0, 33, 38, 41, 47, 57, 59, 60, 61, 0, 63, 0, 66, 0, 0, 0 },
4747
/* d */ { 0, 0, 0, 0, 0, 0, 0, 0, 8, 18, 0, 19, 0, 0, 20, 0, 0, 22, 23, 0, 0, 0, 0, 0, 0, 0 },
48-
/* e */ { 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 8, 10, 11, 0, 0, 0, 0, 0, 0, 0, 18, 0, 19, 0, 0 },
48+
/* e */ { 1, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 8, 10, 11, 0, 0, 0, 0, 0, 0, 0, 21, 0, 22, 0, 0 },
4949
/* f */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0 },
5050
/* g */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 4, 5, 0, 0, 0, 0 },
5151
/* h */ { 5, 0, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -60,7 +60,7 @@ static const unsigned char cmdidxs2[26][26] =
6060
/* q */ { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
6161
/* r */ { 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 19, 0, 0, 0, 0 },
6262
/* s */ { 2, 6, 15, 0, 19, 23, 0, 25, 26, 0, 0, 29, 31, 35, 39, 41, 0, 50, 0, 51, 0, 63, 64, 0, 65, 0 },
63-
/* t */ { 2, 0, 19, 0, 24, 26, 0, 27, 0, 28, 0, 29, 33, 36, 38, 39, 0, 40, 42, 0, 43, 0, 0, 0, 0, 0 },
63+
/* t */ { 2, 0, 19, 0, 24, 26, 0, 27, 0, 28, 0, 29, 33, 36, 38, 39, 0, 40, 42, 0, 43, 0, 0, 0, 45, 0 },
6464
/* u */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
6565
/* v */ { 1, 0, 0, 0, 2, 0, 0, 0, 5, 0, 0, 0, 12, 15, 0, 0, 0, 0, 18, 0, 19, 0, 0, 0, 0, 0 },
6666
/* w */ { 2, 0, 0, 0, 0, 0, 0, 3, 4, 0, 0, 0, 0, 8, 0, 9, 10, 0, 0, 0, 12, 13, 0, 0, 0, 0 },
@@ -69,4 +69,4 @@ static const unsigned char cmdidxs2[26][26] =
6969
/* z */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
7070
};
7171

72-
static const int command_count = 579;
72+
static const int command_count = 584;

src/ex_cmds.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,9 @@ EXCMD(CMD_clist, "clist", qf_list,
344344
EXCMD(CMD_clast, "clast", ex_cc,
345345
EX_RANGE|EX_COUNT|EX_TRLBAR|EX_BANG,
346346
ADDR_UNSIGNED),
347+
EXCMD(CMD_class, "class", ex_ni,
348+
EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
349+
ADDR_NONE),
347350
EXCMD(CMD_close, "close", ex_close,
348351
EX_BANG|EX_RANGE|EX_COUNT|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
349352
ADDR_WINDOWS),
@@ -548,9 +551,15 @@ EXCMD(CMD_emenu, "emenu", ex_emenu,
548551
EXCMD(CMD_endif, "endif", ex_endif,
549552
EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
550553
ADDR_NONE),
554+
EXCMD(CMD_endclass, "endclass", ex_ni,
555+
EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
556+
ADDR_NONE),
551557
EXCMD(CMD_enddef, "enddef", ex_endfunction,
552558
EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
553559
ADDR_NONE),
560+
EXCMD(CMD_endenum, "endenum", ex_ni,
561+
EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
562+
ADDR_NONE),
554563
EXCMD(CMD_endfunction, "endfunction", ex_endfunction,
555564
EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
556565
ADDR_NONE),
@@ -566,6 +575,9 @@ EXCMD(CMD_endwhile, "endwhile", ex_endwhile,
566575
EXCMD(CMD_enew, "enew", ex_edit,
567576
EX_BANG|EX_TRLBAR,
568577
ADDR_NONE),
578+
EXCMD(CMD_enum, "enum", ex_ni,
579+
EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
580+
ADDR_NONE),
569581
EXCMD(CMD_eval, "eval", ex_eval,
570582
EX_EXTRA|EX_NOTRLCOM|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
571583
ADDR_NONE),
@@ -1625,6 +1637,9 @@ EXCMD(CMD_tunmenu, "tunmenu", ex_menu,
16251637
EXCMD(CMD_tunmap, "tunmap", ex_unmap,
16261638
EX_EXTRA|EX_TRLBAR|EX_NOTRLCOM|EX_CTRLV|EX_CMDWIN|EX_LOCK_OK,
16271639
ADDR_NONE),
1640+
EXCMD(CMD_type, "type", ex_ni,
1641+
EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
1642+
ADDR_NONE),
16281643
EXCMD(CMD_undo, "undo", ex_undo,
16291644
EX_RANGE|EX_COUNT|EX_ZEROR|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
16301645
ADDR_OTHER),

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2956,
753755
/**/
754756
2955,
755757
/**/

0 commit comments

Comments
 (0)