Skip to content

Commit d94ac0c

Browse files
committed
patch 8.1.1672: "make cmdidxs" doesn't work
Problem: "make cmdidxs" doesn't work. Solution: Update macro names. (Naruhiko Nishino, closes #4660)
1 parent b7b9efb commit d94ac0c

2 files changed

Lines changed: 9 additions & 7 deletions

File tree

src/create_cmdidxs.vim

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ let lines = readfile('ex_cmds.h')
1414
let idx = 0
1515
while idx < len(lines)
1616
let line = lines[idx]
17-
if line =~ '^EX(CMD_'
18-
let m = matchlist(line, '^EX(CMD_\S*,\s*"\([a-z][^"]*\)"')
17+
if line =~ '^EXCMD(CMD_'
18+
let m = matchlist(line, '^EXCMD(CMD_\S*,\s*"\([a-z][^"]*\)"')
1919
if len(m) >= 2
2020
let cmds += [ m[1] ]
2121
else
@@ -27,18 +27,18 @@ while idx < len(lines)
2727
let idx += 1
2828
let addr_type = lines[idx]
2929

30-
if flags =~ '\<RANGE\>'
30+
if flags =~ '\<EX_RANGE\>'
3131
if addr_type =~ 'ADDR_NONE'
32-
echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Using RANGE with ADDR_NONE: ' .. line
32+
echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Using EX_RANGE with ADDR_NONE: ' .. line
3333
endif
3434
else
3535
if addr_type !~ 'ADDR_NONE'
36-
echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing ADDR_NONE: ' .. line
36+
echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing ADDR_NONE: ' .. line
3737
endif
3838
endif
3939

40-
if flags =~ '\<DFLALL\>' && (addr_type =~ 'ADDR_OTHER' || addr_type =~ 'ADDR_NONE')
41-
echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing misplaced DFLALL: ' .. line
40+
if flags =~ '\<EX_DFLALL\>' && (addr_type =~ 'ADDR_OTHER' || addr_type =~ 'ADDR_NONE')
41+
echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing misplaced EX_DFLALL: ' .. line
4242
endif
4343
endif
4444
let idx += 1

src/version.c

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

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1672,
780782
/**/
781783
1671,
782784
/**/

0 commit comments

Comments
 (0)