Mercurial > vim
changeset 21773:2f2e528c5782 v8.2.1436
patch 8.2.1436: function implementing :substitute has unexpected name
Commit: https://github.com/vim/vim/commit/66e0014ba651208ab7579797866ab0e4bd9e2b49
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 12 21:58:12 2020 +0200
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().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 12 Aug 2020 22:00:04 +0200 |
| parents | cd4522a891dd |
| children | 05319227588e |
| files | src/ex_cmds.c src/ex_cmds.h src/ex_docmd.c src/proto/ex_cmds.pro src/version.c |
| diffstat | 5 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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),
--- 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; }
--- 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);