Patch 8.2.5134

[Bram Moolenaar]

Patch 8.2.5134
Problem: Function has confusing name.
Solution: Rename tgetent_error() to invoke_tgetent().
Files: src/term.c


*** ../vim-8.2.5133/src/term.c 2022-06-16 11:42:05.600034913 +0100
--- src/term.c 2022-06-19 17:44:09.341814610 +0100
***************
*** 73,79 ****
static int term_7to8bit(char_u *p);

#ifdef HAVE_TGETENT
! static char *tgetent_error(char_u *, char_u *);

/*
* Here is our own prototype for tgetstr(), any prototypes from the include
--- 73,79 ----
static int term_7to8bit(char_u *p);

#ifdef HAVE_TGETENT
! static char *invoke_tgetent(char_u *, char_u *);

/*
* Here is our own prototype for tgetstr(), any prototypes from the include
***************
*** 1876,1882 ****
* If the external termcap does not have a matching entry, try the
* builtin ones.
*/
! if ((error_msg = tgetent_error(tbuf, term)) == NULL)
{
if (!termcap_cleared)
{
--- 1876,1882 ----
* If the external termcap does not have a matching entry, try the
* builtin ones.
*/
! if ((error_msg = invoke_tgetent(tbuf, term)) == NULL)
{
if (!termcap_cleared)
{
***************
*** 2204,2210 ****
* Return error message if it fails, NULL if it's OK.
*/
static char *
! tgetent_error(char_u *tbuf, char_u *term)
{
int i;

--- 2204,2210 ----
* Return error message if it fails, NULL if it's OK.
*/
static char *
! invoke_tgetent(char_u *tbuf, char_u *term)
{
int i;

***************
*** 2266,2272 ****
{
char_u tbuf[TBUFSZ];

! if (T_NAME != NULL && *T_NAME != NUL && tgetent_error(tbuf, T_NAME) == NULL)
{
if (*cp == 0)
*cp = tgetnum("co");
--- 2266,2272 ----
{
char_u tbuf[TBUFSZ];

! if (T_NAME != NULL && *T_NAME != NUL && invoke_tgetent(tbuf, T_NAME) == NULL)
{
if (*cp == 0)
*cp = tgetnum("co");
***************
*** 2365,2371 ****
* Search in external termcap
*/
{
! error_msg = tgetent_error(tbuf, term);
if (error_msg == NULL)
{
string = TGETSTR((char *)name, &tp);
--- 2365,2371 ----
* Search in external termcap
*/
{
! error_msg = invoke_tgetent(tbuf, term);
if (error_msg == NULL)
{
string = TGETSTR((char *)name, &tp);
*** ../vim-8.2.5133/src/version.c 2022-06-19 17:22:45.561028227 +0100
--- src/version.c 2022-06-19 17:44:58.313737477 +0100
***************
*** 736,737 ****
--- 736,739 ----
{ /* Add new patch number below this line */
+ /**/
+ 5134,
/**/

--
ARTHUR: You are indeed brave Sir knight, but the fight is mine.
BLACK KNIGHT: Had enough?
ARTHUR: You stupid bastard. You havn't got any arms left.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///