summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-10-21 14:49:08 +0200
committerBram Moolenaar <Bram@vim.org>2020-10-21 14:49:08 +0200
commitb8f519e5382f9876ae7f8bc64d9814d07a8ef972 (patch)
treeee8402b12f9d19f039123a9d1ca652e5077192f4
parent94738d8fab09c5563e1512f1695e047c715ad274 (diff)
patch 8.2.1877: test for function list failsv8.2.1877
Problem: Test for function list fails. Solution: Move "obsolete" comments one line up.
-rw-r--r--src/evalfunc.c28
-rw-r--r--src/version.c2
2 files changed, 16 insertions, 14 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index adfc226a05..d782d8494d 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -604,12 +604,12 @@ static funcentry_T global_functions[] =
ret_number, f_bufadd},
{"bufexists", 1, 1, FEARG_1, NULL,
ret_number, f_bufexists},
- {"buffer_exists", 1, 1, FEARG_1, NULL,
- ret_number, f_bufexists}, // obsolete
- {"buffer_name", 0, 1, FEARG_1, NULL,
- ret_string, f_bufname}, // obsolete
- {"buffer_number", 0, 1, FEARG_1, NULL,
- ret_number, f_bufnr}, // obsolete
+ {"buffer_exists", 1, 1, FEARG_1, NULL, // obsolete
+ ret_number, f_bufexists},
+ {"buffer_name", 0, 1, FEARG_1, NULL, // obsolete
+ ret_string, f_bufname},
+ {"buffer_number", 0, 1, FEARG_1, NULL, // obsolete
+ ret_number, f_bufnr},
{"buflisted", 1, 1, FEARG_1, NULL,
ret_number, f_buflisted},
{"bufload", 1, 1, FEARG_1, NULL,
@@ -756,8 +756,8 @@ static funcentry_T global_functions[] =
ret_first_arg, f_extend},
{"feedkeys", 1, 2, FEARG_1, NULL,
ret_void, f_feedkeys},
- {"file_readable", 1, 1, FEARG_1, NULL,
- ret_number, f_filereadable}, // obsolete
+ {"file_readable", 1, 1, FEARG_1, NULL, // obsolete
+ ret_number, f_filereadable},
{"filereadable", 1, 1, FEARG_1, NULL,
ret_number, f_filereadable},
{"filewritable", 1, 1, FEARG_1, NULL,
@@ -900,10 +900,10 @@ static funcentry_T global_functions[] =
ret_number, f_haslocaldir},
{"hasmapto", 1, 3, FEARG_1, NULL,
ret_number, f_hasmapto},
- {"highlightID", 1, 1, FEARG_1, NULL,
- ret_number, f_hlID}, // obsolete
- {"highlight_exists",1, 1, FEARG_1, NULL,
- ret_number, f_hlexists}, // obsolete
+ {"highlightID", 1, 1, FEARG_1, NULL, // obsolete
+ ret_number, f_hlID},
+ {"highlight_exists",1, 1, FEARG_1, NULL, // obsolete
+ ret_number, f_hlexists},
{"histadd", 2, 2, FEARG_2, NULL,
ret_number, f_histadd},
{"histdel", 1, 2, FEARG_1, NULL,
@@ -976,8 +976,8 @@ static funcentry_T global_functions[] =
ret_string, f_json_encode},
{"keys", 1, 1, FEARG_1, NULL,
ret_list_string, f_keys},
- {"last_buffer_nr", 0, 0, 0, NULL,
- ret_number, f_last_buffer_nr}, // obsolete
+ {"last_buffer_nr", 0, 0, 0, NULL, // obsolete
+ ret_number, f_last_buffer_nr},
{"len", 1, 1, FEARG_1, NULL,
ret_number, f_len},
{"libcall", 3, 3, FEARG_3, NULL,
diff --git a/src/version.c b/src/version.c
index ce5f83a05c..d18f1016f9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1877,
+/**/
1876,
/**/
1875,