aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.5134: function has confusing name

Browse Source 
Problem:    Function has confusing name.
Solution:   Rename tgetent_error() to invoke_tgetent().
This commit is contained in:
Bram Moolenaar 2022-06-19 17:45:28 +01:00
parent 1f68d992cd
commit 3efd65c557
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/term.c
View File

@ -73,7 +73,7 @@ static int term_is_builtin(char_u *name);
static int term_7to8bit(char_u *p); static int term_7to8bit(char_u *p);
#ifdef HAVE_TGETENT #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 * 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 * If the external termcap does not have a matching entry, try the
* builtin ones. * builtin ones.
*/ */
if ((error_msg = tgetent_error(tbuf, term)) == NULL) if ((error_msg = invoke_tgetent(tbuf, term)) == NULL)
{ {
if (!termcap_cleared) if (!termcap_cleared)
{ {
@ -2204,7 +2204,7 @@ free_cur_term()
* Return error message if it fails, NULL if it's OK. * Return error message if it fails, NULL if it's OK.
*/ */
static char * static char *
tgetent_error(char_u *tbuf, char_u *term) invoke_tgetent(char_u *tbuf, char_u *term)
{ {
int i; int i;
@ -2266,7 +2266,7 @@ getlinecol(
{ {
char_u tbuf[TBUFSZ]; 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) if (*cp == 0)
*cp = tgetnum("co"); *cp = tgetnum("co");
@ -2365,7 +2365,7 @@ add_termcap_entry(char_u *name, int force)
* Search in external termcap * Search in external termcap
*/ */
{ {
error_msg = tgetent_error(tbuf, term); error_msg = invoke_tgetent(tbuf, term);
if (error_msg == NULL) if (error_msg == NULL)
{ {
string = TGETSTR((char *)name, &tp); string = TGETSTR((char *)name, &tp);

2
src/version.c
View File

@ -734,6 +734,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
5134,
/**/ /**/
5133, 5133,
/**/ /**/