changeset 29230:3d3d629f5038 v8.2.5134

patch 8.2.5134: function has confusing name Commit: https://github.com/vim/vim/commit/3efd65c55710cbd2db7569096554bc92f4a66a43 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 19 17:45:28 2022 +0100 patch 8.2.5134: function has confusing name Problem: Function has confusing name. Solution: Rename tgetent_error() to invoke_tgetent().
author Bram Moolenaar <Bram@vim.org>
date Sun, 19 Jun 2022 19:00:05 +0200
parents 35aed380fd46
children ff3b9f7abca3
files src/term.c src/version.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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 forc
 	 * 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);
--- 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,