From: Bram Moolenaar Date: Sun, 9 Jun 2019 12:51:30 +0000 (+0200) Subject: patch 8.1.1506: syntax error in Travis config X-Git-Tag: v8.1.1506 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b29cfb8c28a66604ebb468c73d86669870a3b06b;p=vim patch 8.1.1506: syntax error in Travis config Problem: Syntax error in Travis config. Solution: Set AUDIODEV in another section. --- diff --git a/.travis.yml b/.travis.yml index 02a449b47..4e7df286d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,6 @@ compiler: - gcc env: - global: - # pretend to play sounds - AUDIODEV=null - &tiny-nogui BUILD=yes TEST=test COVERAGE=no FEATURES=tiny "CONFOPT='--disable-gui'" SHADOWOPT= SRCDIR=./src CHECK_AUTOCONF=no - &tiny @@ -141,6 +138,8 @@ before_script: if [[ "${TRAVIS_OS_NAME}" = "linux" ]]; then export DISPLAY=:99.0 sh -e /etc/init.d/xvfb start && sleep 3 + # pretend to play sound + export AUDIODEV=null fi script: diff --git a/src/version.c b/src/version.c index 13db30461..5c1287264 100644 --- a/src/version.c +++ b/src/version.c @@ -777,6 +777,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1506, /**/ 1505, /**/