diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-12 20:24:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-12 20:24:59 +0200 |
| commit | d94ac0caca12c6ceb54b07fc932edba84a5f60f2 (patch) | |
| tree | 5a13ca103450a14dc5f3551aeb2de918f81b3e67 | |
| parent | b7b9efbccfe17ee3f7b1bb877b7745d5bfbf0804 (diff) | |
patch 8.1.1672: "make cmdidxs" doesn't workv8.1.1672
Problem: "make cmdidxs" doesn't work.
Solution: Update macro names. (Naruhiko Nishino, closes #4660)
| -rw-r--r-- | src/create_cmdidxs.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/create_cmdidxs.vim b/src/create_cmdidxs.vim index 1d73c5faaf..2f8ad1f7e1 100644 --- a/src/create_cmdidxs.vim +++ b/src/create_cmdidxs.vim @@ -14,8 +14,8 @@ let lines = readfile('ex_cmds.h') let idx = 0 while idx < len(lines) let line = lines[idx] - if line =~ '^EX(CMD_' - let m = matchlist(line, '^EX(CMD_\S*,\s*"\([a-z][^"]*\)"') + if line =~ '^EXCMD(CMD_' + let m = matchlist(line, '^EXCMD(CMD_\S*,\s*"\([a-z][^"]*\)"') if len(m) >= 2 let cmds += [ m[1] ] else @@ -27,18 +27,18 @@ while idx < len(lines) let idx += 1 let addr_type = lines[idx] - if flags =~ '\<RANGE\>' + if flags =~ '\<EX_RANGE\>' if addr_type =~ 'ADDR_NONE' - echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Using RANGE with ADDR_NONE: ' .. line + echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Using EX_RANGE with ADDR_NONE: ' .. line endif else if addr_type !~ 'ADDR_NONE' - echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing ADDR_NONE: ' .. line + echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing ADDR_NONE: ' .. line endif endif - if flags =~ '\<DFLALL\>' && (addr_type =~ 'ADDR_OTHER' || addr_type =~ 'ADDR_NONE') - echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing misplaced DFLALL: ' .. line + if flags =~ '\<EX_DFLALL\>' && (addr_type =~ 'ADDR_OTHER' || addr_type =~ 'ADDR_NONE') + echoerr 'ex_cmds.h:' .. (idx - 1) .. ': Missing misplaced EX_DFLALL: ' .. line endif endif let idx += 1 diff --git a/src/version.c b/src/version.c index 98259240d4..ea5de7db29 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1672, +/**/ 1671, /**/ 1670, |