# HG changeset patch # User Christian Brabandt # Date 1509660905 -3600 # Node ID f473855aa9a962c2e6a17a952eea45007a05f4c3 # Parent 3b26420fc639cb036050826c318c8d12f62888ac patch 8.0.1256: typo in configure variable vim_cv_tgent commit https://github.com/vim/vim/commit/a88254f70458e7d4c998de7cc41aa06176eb61dc Author: Bram Moolenaar Date: Thu Nov 2 23:04:14 2017 +0100 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 https://github.com/vim/vim/issues/2281) diff --git a/src/auto/configure b/src/auto/configure --- 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 - -else - - vim_cv_tgent=non-zero + vim_cv_tgetent=zero + +else + + 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; } - -if test "x$vim_cv_tgent" = "xzero" ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgetent" >&5 +$as_echo "$vim_cv_tgetent" >&6; } + +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 --- a/src/configure.ac +++ b/src/configure.ac @@ -3388,7 +3388,7 @@ if test "x$vim_cv_terminfo" = "xyes" ; t 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 f 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 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1256, +/**/ 1255, /**/ 1254,