summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-19 23:21:55 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-19 23:21:55 +0200
commit4bd782339e370bde82c2a8976df9f335cc12eba9 (patch)
tree9422e4c3656444037cc7547c8c7de3ed1c71e909
parent7528d1f6b5422750eb778dfb550cfd0b0e540964 (diff)
downloadvim-git-4bd782339e370bde82c2a8976df9f335cc12eba9.tar.gz
patch 8.1.2058: function for ex command is named inconsistentlyv8.1.2058
Problem: Function for ex command is named inconsistently. Solution: Rename do_marks() to ex_marks().
-rw-r--r--src/ex_cmds.h2
-rw-r--r--src/mark.c2
-rw-r--r--src/proto/mark.pro2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 2490b5424..09d62a9c8 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -928,7 +928,7 @@ EXCMD(CMD_map, "map", ex_map,
EXCMD(CMD_mapclear, "mapclear", ex_mapclear,
EX_EXTRA|EX_BANG|EX_TRLBAR|EX_CMDWIN,
ADDR_NONE),
-EXCMD(CMD_marks, "marks", do_marks,
+EXCMD(CMD_marks, "marks", ex_marks,
EX_EXTRA|EX_TRLBAR|EX_CMDWIN,
ADDR_NONE),
EXCMD(CMD_match, "match", ex_match,
diff --git a/src/mark.c b/src/mark.c
index 8a18040c7..a77e7b9dd 100644
--- a/src/mark.c
+++ b/src/mark.c
@@ -699,7 +699,7 @@ mark_line(pos_T *mp, int lead_len)
* print the marks
*/
void
-do_marks(exarg_T *eap)
+ex_marks(exarg_T *eap)
{
char_u *arg = eap->arg;
int i;
diff --git a/src/proto/mark.pro b/src/proto/mark.pro
index 602bfa28a..a28fa9a37 100644
--- a/src/proto/mark.pro
+++ b/src/proto/mark.pro
@@ -13,7 +13,7 @@ void fmarks_check_names(buf_T *buf);
int check_mark(pos_T *pos);
void clrallmarks(buf_T *buf);
char_u *fm_getname(fmark_T *fmark, int lead_len);
-void do_marks(exarg_T *eap);
+void ex_marks(exarg_T *eap);
void ex_delmarks(exarg_T *eap);
void ex_jumps(exarg_T *eap);
void ex_clearjumps(exarg_T *eap);
diff --git a/src/version.c b/src/version.c
index 3ed4c802e..1bfe75caf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2058,
+/**/
2057,
/**/
2056,