Patch 8.2.1436

[Bram Moolenaar]

Patch 8.2.1436
Problem: Function implementing :substitute has unexpected name.
Solution: Rename from do_sub() to ex_substitute().
Files: src/ex_cmds.c, src/proto/ex_cmds.pro, src/ex_docmd.c,
src/ex_cmds.h,


*** ../vim-8.2.1435/src/ex_cmds.c 2020-07-28 20:25:43.826309924 +0200
--- src/ex_cmds.c 2020-08-12 21:54:14.585057541 +0200
***************
*** 3553,3559 ****
* The usual escapes are supported as described in the regexp docs.
*/
void
! do_sub(exarg_T *eap)
{
linenr_T lnum;
long i = 0;
--- 3553,3559 ----
* The usual escapes are supported as described in the regexp docs.
*/
void
! ex_substitute(exarg_T *eap)
{
linenr_T lnum;
long i = 0;
*** ../vim-8.2.1435/src/proto/ex_cmds.pro 2020-07-21 21:07:00.720496743 +0200
--- src/proto/ex_cmds.pro 2020-08-12 21:55:02.408850819 +0200
***************
*** 27,33 ****
void ex_z(exarg_T *eap);
int check_restricted(void);
int check_secure(void);
! void do_sub(exarg_T *eap);
int do_sub_msg(int count_only);
void ex_global(exarg_T *eap);
void global_exe(char_u *cmd);
--- 27,33 ----
void ex_z(exarg_T *eap);
int check_restricted(void);
int check_secure(void);
! 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);
*** ../vim-8.2.1435/src/ex_docmd.c 2020-08-10 19:21:12.159749087 +0200
--- src/ex_docmd.c 2020-08-12 21:54:23.045020926 +0200
***************
*** 7343,7349 ****
int magic_save = p_magic;

p_magic = (eap->cmdidx == CMD_smagic);
! do_sub(eap);
p_magic = magic_save;
}

--- 7343,7349 ----
int magic_save = p_magic;

p_magic = (eap->cmdidx == CMD_smagic);
! ex_substitute(eap);
p_magic = magic_save;
}

*** ../vim-8.2.1435/src/ex_cmds.h 2020-08-09 14:33:51.912756045 +0200
--- src/ex_cmds.h 2020-08-12 21:54:55.100882364 +0200
***************
*** 1270,1276 ****
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,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK,
ADDR_LINES),
EXCMD(CMD_sNext, "sNext", ex_previous,
--- 1270,1276 ----
EXCMD(CMD_rviminfo, "rviminfo", ex_viminfo,
EX_BANG|EX_FILE1|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_NONE),
! 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,1794 ****
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,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
ADDR_LINES),
EXCMD(CMD_star, "*", ex_at,
--- 1788,1794 ----
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, "&", ex_substitute,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
ADDR_LINES),
EXCMD(CMD_star, "*", ex_at,
***************
*** 1806,1812 ****
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,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
ADDR_LINES),

--- 1806,1812 ----
EXCMD(CMD_at, "@", ex_at,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_LINES),
! EXCMD(CMD_tilde, "~", ex_substitute,
EX_RANGE|EX_WHOLEFOLD|EX_EXTRA|EX_CMDWIN|EX_LOCK_OK|EX_MODIFY,
ADDR_LINES),

*** ../vim-8.2.1435/src/version.c 2020-08-12 21:34:43.270489452 +0200
--- src/version.c 2020-08-12 21:57:48.340138118 +0200
***************
*** 756,757 ****
--- 756,759 ----
{ /* Add new patch number below this line */
+ /**/
+ 1436,
/**/

--
hundred-and-one symptoms of being an internet addict:
186. You overstay in the office so you can have more time surfing the net.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///