Skip to content

Commit 3efd65c

Browse files
committed
patch 8.2.5134: function has confusing name
Problem: Function has confusing name. Solution: Rename tgetent_error() to invoke_tgetent().
1 parent 1f68d99 commit 3efd65c

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/term.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static int term_is_builtin(char_u *name);
7373
static int term_7to8bit(char_u *p);
7474

7575
#ifdef HAVE_TGETENT
76-
static char *tgetent_error(char_u *, char_u *);
76+
static char *invoke_tgetent(char_u *, char_u *);
7777

7878
/*
7979
* Here is our own prototype for tgetstr(), any prototypes from the include
@@ -1876,7 +1876,7 @@ set_termname(char_u *term)
18761876
* If the external termcap does not have a matching entry, try the
18771877
* builtin ones.
18781878
*/
1879-
if ((error_msg = tgetent_error(tbuf, term)) == NULL)
1879+
if ((error_msg = invoke_tgetent(tbuf, term)) == NULL)
18801880
{
18811881
if (!termcap_cleared)
18821882
{
@@ -2204,7 +2204,7 @@ free_cur_term()
22042204
* Return error message if it fails, NULL if it's OK.
22052205
*/
22062206
static char *
2207-
tgetent_error(char_u *tbuf, char_u *term)
2207+
invoke_tgetent(char_u *tbuf, char_u *term)
22082208
{
22092209
int i;
22102210

@@ -2266,7 +2266,7 @@ getlinecol(
22662266
{
22672267
char_u tbuf[TBUFSZ];
22682268

2269-
if (T_NAME != NULL && *T_NAME != NUL && tgetent_error(tbuf, T_NAME) == NULL)
2269+
if (T_NAME != NULL && *T_NAME != NUL && invoke_tgetent(tbuf, T_NAME) == NULL)
22702270
{
22712271
if (*cp == 0)
22722272
*cp = tgetnum("co");
@@ -2365,7 +2365,7 @@ add_termcap_entry(char_u *name, int force)
23652365
* Search in external termcap
23662366
*/
23672367
{
2368-
error_msg = tgetent_error(tbuf, term);
2368+
error_msg = invoke_tgetent(tbuf, term);
23692369
if (error_msg == NULL)
23702370
{
23712371
string = TGETSTR((char *)name, &tp);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
5134,
737739
/**/
738740
5133,
739741
/**/

0 commit comments

Comments
 (0)