patch 8.1.2058: function for ex command is named inconsistently

Problem:    Function for ex command is named inconsistently.
Solution:   Rename do_marks() to ex_marks().

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 2490b5424f7bd6d8ced96f1cc50faf03c1a7788e..09d62a9c8fd149d4582d5cac6e4399e7360e8731 100644 (file)
--- 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 8a18040c7595ad78ad33b4b266881cd5234f33ab..a77e7b9ddfaec530fd6703ba7b65545cc8534e1a 100644 (file)
--- 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 602bfa28aa87f1f20b99952b675688e047ee01ff..a28fa9a378839eb08239fb630a8b16b6c3e5783c 100644 (file)
--- 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 3ed4c802e0adc29bb0bcf1f8296478f529dce28c..1bfe75cafecfdd83b346bd8c49a7cfc47d9c85a5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2058,
 /**/
     2057,
 /**/