changeset 17346:72ce5ca82a75 v8.1.1672

patch 8.1.1672: "make cmdidxs" doesn't work commit https://github.com/vim/vim/commit/d94ac0caca12c6ceb54b07fc932edba84a5f60f2 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jul 12 20:24:59 2019 +0200 patch 8.1.1672: "make cmdidxs" doesn't work Problem: "make cmdidxs" doesn't work. Solution: Update macro names. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/4660)
author Bram Moolenaar <Bram@vim.org>
date Fri, 12 Jul 2019 20:30:06 +0200
parents 847e18dbfac2
children 21b9633e27d1
files src/create_cmdidxs.vim src/version.c
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,