diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-19 17:45:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-19 17:45:28 +0100 |
| commit | 3efd65c55710cbd2db7569096554bc92f4a66a43 (patch) | |
| tree | 498437c58869f5e7bb5952cd91422bc19b700789 | |
| parent | 1f68d992cd2fd7f484fbdc14eb8a9feefe59bec8 (diff) | |
patch 8.2.5134: function has confusing namev8.2.5134
Problem: Function has confusing name.
Solution: Rename tgetent_error() to invoke_tgetent().
| -rw-r--r-- | src/term.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/term.c b/src/term.c index c40f9f545e..c1440d850f 100644 --- a/src/term.c +++ b/src/term.c @@ -73,7 +73,7 @@ static int term_is_builtin(char_u *name); static int term_7to8bit(char_u *p); #ifdef HAVE_TGETENT -static char *tgetent_error(char_u *, char_u *); +static char *invoke_tgetent(char_u *, char_u *); /* * Here is our own prototype for tgetstr(), any prototypes from the include @@ -1876,7 +1876,7 @@ set_termname(char_u *term) * If the external termcap does not have a matching entry, try the * builtin ones. */ - if ((error_msg = tgetent_error(tbuf, term)) == NULL) + if ((error_msg = invoke_tgetent(tbuf, term)) == NULL) { if (!termcap_cleared) { @@ -2204,7 +2204,7 @@ free_cur_term() * Return error message if it fails, NULL if it's OK. */ static char * -tgetent_error(char_u *tbuf, char_u *term) +invoke_tgetent(char_u *tbuf, char_u *term) { int i; @@ -2266,7 +2266,7 @@ getlinecol( { char_u tbuf[TBUFSZ]; - if (T_NAME != NULL && *T_NAME != NUL && tgetent_error(tbuf, T_NAME) == NULL) + if (T_NAME != NULL && *T_NAME != NUL && invoke_tgetent(tbuf, T_NAME) == NULL) { if (*cp == 0) *cp = tgetnum("co"); @@ -2365,7 +2365,7 @@ add_termcap_entry(char_u *name, int force) * Search in external termcap */ { - error_msg = tgetent_error(tbuf, term); + error_msg = invoke_tgetent(tbuf, term); if (error_msg == NULL) { string = TGETSTR((char *)name, &tp); diff --git a/src/version.c b/src/version.c index f27217e147..2c0a1eca20 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5134, +/**/ 5133, /**/ 5132, |