patch 8.2.1436: function implementing :substitute has unexpected name

Problem:    Function implementing :substitute has unexpected name.
Solution:   Rename from do_sub() to ex_substitute().

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 88161fa2c44598b3fbbcd6f854d70e8b6485ba14..2550f0e30e5a5e9f1c4a4194fd579d68f120d0d4 100644 (file)
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -3553,7 +3553,7 @@ typedef struct {
  * The usual escapes are supported as described in the regexp docs.
  */
     void
-do_sub(exarg_T *eap)
+ex_substitute(exarg_T *eap)
 {
     linenr_T   lnum;
     long       i = 0;

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 508ecb870438463280c0e28c82dc22579109d8cb..b993ef21a86af3969c35324fbfdbbf3c8574e921 100644 (file)
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -1270,7 +1270,7 @@ EXCMD(CMD_rundo,  "rundo",        ex_rundo,
 EXCMD(CMD_rviminfo,    "rviminfo",     ex_viminfo,
        EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
        ADDR_NONE),
-EXCMD(CMD_substitute,  "substitute",   do_sub,
+EXCMD(CMD_substitute,  "substitute",   ex_substitute,
        EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
        ADDR_LINES),
 EXCMD(CMD_sNext,       "sNext",        ex_previous,
@@ -1788,7 +1788,7 @@ EXCMD(CMD_bang,           "!",            ex_bang,
 EXCMD(CMD_pound,       "#",            ex_print,
        EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
        ADDR_LINES),
-EXCMD(CMD_and,         "&",            do_sub,
+EXCMD(CMD_and,         "&",            ex_substitute,
        EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
        ADDR_LINES),
 EXCMD(CMD_star,                "*",            ex_at,
@@ -1806,7 +1806,7 @@ EXCMD(CMD_rshift, ">",            ex_operators,
 EXCMD(CMD_at,          "@",            ex_at,
        EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
        ADDR_LINES),
-EXCMD(CMD_tilde,       "~",            do_sub,
+EXCMD(CMD_tilde,       "~",            ex_substitute,
        EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
        ADDR_LINES),
 

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 502f33e2a50ab3d4940189cdd7f081ddcc965769..85d4df6901ef5522cf0b054b12a5d6136b2fa0a3 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7343,7 +7343,7 @@ ex_submagic(exarg_T *eap)
     int                magic_save = p_magic;
 
     p_magic = (eap->cmdidx == CMD_smagic);
-    do_sub(eap);
+    ex_substitute(eap);
     p_magic = magic_save;
 }
 

diff --git a/src/proto/ex_cmds.pro b/src/proto/ex_cmds.pro
index a9e0658a9ba795f4eb216cda39953850a6089617..9036dd205b5fc5a5fbabb122eff821603d3e0b33 100644 (file)
--- a/src/proto/ex_cmds.pro
+++ b/src/proto/ex_cmds.pro
@@ -27,7 +27,7 @@ void ex_change(exarg_T *eap);
 void ex_z(exarg_T *eap);
 int check_restricted(void);
 int check_secure(void);
-void do_sub(exarg_T *eap);
+void ex_substitute(exarg_T *eap);
 int do_sub_msg(int count_only);
 void ex_global(exarg_T *eap);
 void global_exe(char_u *cmd);

diff --git a/src/version.c b/src/version.c
index f764e9867d7cd49f605fa7787558387ed0103392..d4b0afa7beb869fd221ba1593e1530798ff4cef4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1436,
 /**/
     1435,
 /**/