patch 8.1.1672: "make cmdidxs" doesn't work

Problem:    "make cmdidxs" doesn't work.
Solution:   Update macro names. (Naruhiko Nishino, closes #4660)

diff --git a/src/create_cmdidxs.vim b/src/create_cmdidxs.vim
index 1d73c5faafc9a05b72c388eef54eb7d58ad76077..2f8ad1f7e14d169f949ace2c1e720aaa28a4201f 100644 (file)
--- 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 98259240d4d9cef2d3b83d6a83df1aa58a949fb9..ea5de7db29ac383d15bd164977cd0eec89d49b23 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1672,
 /**/
     1671,
 /**/