Skip to content

Commit 66e0014

Browse files
committed
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().
1 parent 418f1df commit 66e0014

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/ex_cmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3553,7 +3553,7 @@ typedef struct {
35533553
* The usual escapes are supported as described in the regexp docs.
35543554
*/
35553555
void
3556-
do_sub(exarg_T *eap)
3556+
ex_substitute(exarg_T *eap)
35573557
{
35583558
linenr_T lnum;
35593559
long i = 0;

src/ex_cmds.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,7 @@ EXCMD(CMD_rundo, "rundo", ex_rundo,
12701270
EXCMD(CMD_rviminfo, "rviminfo", ex_viminfo,
12711271
EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
12721272
ADDR_NONE),
1273-
EXCMD(CMD_substitute, "substitute", do_sub,
1273+
EXCMD(CMD_substitute, "substitute", ex_substitute,
12741274
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
12751275
ADDR_LINES),
12761276
EXCMD(CMD_sNext, "sNext", ex_previous,
@@ -1788,7 +1788,7 @@ EXCMD(CMD_bang, "!", ex_bang,
17881788
EXCMD(CMD_pound, "#", ex_print,
17891789
EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
17901790
ADDR_LINES),
1791-
EXCMD(CMD_and, "&", do_sub,
1791+
EXCMD(CMD_and, "&", ex_substitute,
17921792
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
17931793
ADDR_LINES),
17941794
EXCMD(CMD_star, "*", ex_at,
@@ -1806,7 +1806,7 @@ EXCMD(CMD_rshift, ">", ex_operators,
18061806
EXCMD(CMD_at, "@", ex_at,
18071807
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
18081808
ADDR_LINES),
1809-
EXCMD(CMD_tilde, "~", do_sub,
1809+
EXCMD(CMD_tilde, "~", ex_substitute,
18101810
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
18111811
ADDR_LINES),
18121812

src/ex_docmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7343,7 +7343,7 @@ ex_submagic(exarg_T *eap)
73437343
int magic_save = p_magic;
73447344

73457345
p_magic = (eap->cmdidx == CMD_smagic);
7346-
do_sub(eap);
7346+
ex_substitute(eap);
73477347
p_magic = magic_save;
73487348
}
73497349

src/proto/ex_cmds.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void ex_change(exarg_T *eap);
2727
void ex_z(exarg_T *eap);
2828
int check_restricted(void);
2929
int check_secure(void);
30-
void do_sub(exarg_T *eap);
30+
void ex_substitute(exarg_T *eap);
3131
int do_sub_msg(int count_only);
3232
void ex_global(exarg_T *eap);
3333
void global_exe(char_u *cmd);

src/version.c

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

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1436,
757759
/**/
758760
1435,
759761
/**/

0 commit comments

Comments
 (0)