thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1436: function implementing :substitute has unexpected name

Browse Source 
Problem:    Function implementing :substitute has unexpected name.
Solution:   Rename from do_sub() to ex_substitute().
This commit is contained in:
Bram Moolenaar
2020-08-12 21:58:12 +02:00
parent 418f1df547
commit 66e0014ba6
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_cmds.c
View File

@@ -3553,7 +3553,7 @@ typedef struct {
* The usual escapes are supported as described in the regexp docs. * The usual escapes are supported as described in the regexp docs.
*/ */
void void
do_sub(exarg_T *eap) ex_substitute(exarg_T *eap)
{ {
linenr_T lnum; linenr_T lnum;
long i = 0; long i = 0;

6
src/ex_cmds.h
View File

@@ -1270,7 +1270,7 @@ EXCMD(CMD_rundo, "rundo", ex_rundo,
EXCMD(CMD_rviminfo, "rviminfo", ex_viminfo, EXCMD(CMD_rviminfo, "rviminfo", ex_viminfo,
EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK, EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_NONE), 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, EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
ADDR_LINES), ADDR_LINES),
EXCMD(CMD_sNext, "sNext", ex_previous, EXCMD(CMD_sNext, "sNext", ex_previous,
@@ -1788,7 +1788,7 @@ EXCMD(CMD_bang, "!", ex_bang,
EXCMD(CMD_pound, "#", ex_print, EXCMD(CMD_pound, "#", ex_print,
EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK, EX_RANGE|EX_WHOLEFOLD|EX_COUNT|EX_FLAGS|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_LINES), 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, EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
ADDR_LINES), ADDR_LINES),
EXCMD(CMD_star, "*", ex_at, EXCMD(CMD_star, "*", ex_at,
@@ -1806,7 +1806,7 @@ EXCMD(CMD_rshift, ">", ex_operators,
EXCMD(CMD_at, "@", ex_at, EXCMD(CMD_at, "@", ex_at,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK, EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_LINES), 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, EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
ADDR_LINES), ADDR_LINES),

2
src/ex_docmd.c
View File

@@ -7343,7 +7343,7 @@ ex_submagic(exarg_T *eap)
int magic_save = p_magic; int magic_save = p_magic;
p_magic = (eap->cmdidx == CMD_smagic); p_magic = (eap->cmdidx == CMD_smagic);
do_sub(eap); ex_substitute(eap);
p_magic = magic_save; p_magic = magic_save;
} }

2
src/proto/ex_cmds.pro
View File

@@ -27,7 +27,7 @@ void ex_change(exarg_T *eap);
void ex_z(exarg_T *eap); void ex_z(exarg_T *eap);
int check_restricted(void); int check_restricted(void);
int check_secure(void); int check_secure(void);
void do_sub(exarg_T *eap); void ex_substitute(exarg_T *eap);
int do_sub_msg(int count_only); int do_sub_msg(int count_only);
void ex_global(exarg_T *eap); void ex_global(exarg_T *eap);
void global_exe(char_u *cmd); void global_exe(char_u *cmd);

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1436,
/**/ /**/
1435, 1435,
/**/ /**/