From: Bram Moolenaar Date: Tue, 29 Dec 2015 12:59:29 +0000 (+0100) Subject: patch 7.4.990 X-Git-Tag: v7.4.990 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5c5f0c66c9491aca013f30da6e4f730a7ba7db6;p=vim patch 7.4.990 Problem: Test 86 fails on AppVeyor. Solution: Do some registry magic. (Ken Takata) --- diff --git a/appveyor.yml b/appveyor.yml index 4700efc04..ab379f9fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,9 @@ skip_tags: true before_build: - '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 /release' + # Work around for Python 2.7.11's bug + - reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:32 + - reg copy HKLM\SOFTWARE\Python\PythonCore\2.7 HKLM\SOFTWARE\Python\PythonCore\2.7-32 /s /reg:64 build_script: - cd src diff --git a/src/version.c b/src/version.c index ddf260bbf..af7afea52 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 990, /**/ 989, /**/