patch 8.0.1256: typo in configure variable vim_cv_tgent

Problem:    Typo in configure variable vim_cv_tgent. (Matthieu Guillard)
Solution:   Rename the variable. (closes #2281)

diff --git a/src/auto/configure b/src/auto/configure
index 467f9dcf4c11628bacffd5aef0727655048065e5..16cbcf30ae9c247a8ec9cb1e6ed21d45fe9a7ccf 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -11553,7 +11553,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5
 $as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; }
-if ${vim_cv_tgent+:} false; then :
+if ${vim_cv_tgetent+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -11579,11 +11579,11 @@ main()
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
-      vim_cv_tgent=zero
+      vim_cv_tgetent=zero
 
 else
 
-      vim_cv_tgent=non-zero
+      vim_cv_tgetent=non-zero
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
@@ -11592,10 +11592,10 @@ fi
 
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgent" >&5
-$as_echo "$vim_cv_tgent" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgetent" >&5
+$as_echo "$vim_cv_tgetent" >&6; }
 
-if test "x$vim_cv_tgent" = "xzero" ; then
+if test "x$vim_cv_tgetent" = "xzero" ; then
   $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h
 
 fi

diff --git a/src/configure.ac b/src/configure.ac
index f4c01943db1d27a902aa8fefda5a39cd7a652e3f..e28712413c7cf70814a2740709440fe0f203e999 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3388,7 +3388,7 @@ if test "x$vim_cv_terminfo" = "xyes" ; then
   AC_DEFINE(TERMINFO)
 fi
 
-AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
+AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgetent],
   [
     AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include "confdefs.h"
@@ -3402,15 +3402,15 @@ AC_CACHE_CHECK([what tgetent() returns for an unknown terminal], [vim_cv_tgent],
 main()
 {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
     ]])],[
-      vim_cv_tgent=zero
+      vim_cv_tgetent=zero
     ],[
-      vim_cv_tgent=non-zero
+      vim_cv_tgetent=non-zero
     ],[
       AC_MSG_ERROR(failed to compile test program.)
     ])
   ])
 
-if test "x$vim_cv_tgent" = "xzero" ; then
+if test "x$vim_cv_tgetent" = "xzero" ; then
   AC_DEFINE(TGETENT_ZERO_ERR, 0)
 fi
 

diff --git a/src/version.c b/src/version.c
index 8cc9bba68e2e5ea26d211af09f2bb2967050747f..e94b81a78e6260a7812a365dc054ba2330be7212 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1256,
 /**/
     1255,
 /**/