diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-02 23:04:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-02 23:04:14 +0100 |
| commit | a88254f70458e7d4c998de7cc41aa06176eb61dc (patch) | |
| tree | 2e8f1eb153a52b88bd71bf3f94764cfd62533b08 | |
| parent | 01164a6546b4c635daf96a1f17d1cb2d07f32a66 (diff) | |
| download | vim-git-8.0.1256.tar.gz | |
patch 8.0.1256: typo in configure variable vim_cv_tgentv8.0.1256
Problem: Typo in configure variable vim_cv_tgent. (Matthieu Guillard)
Solution: Rename the variable. (closes #2281)
| -rwxr-xr-x | src/auto/configure | 12 | ||||
| -rw-r--r-- | src/configure.ac | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/auto/configure b/src/auto/configure index 467f9dcf4..16cbcf30a 100755 --- 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 f4c01943d..e28712413 100644 --- 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 8cc9bba68..e94b81a78 100644 --- 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, |