diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-12-29 13:59:29 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-12-29 13:59:29 +0100 |
commit | e5c5f0c66c9491aca013f30da6e4f730a7ba7db6 (patch) | |
tree | c7b5706deb5b84a7239d1f24ae0deeddef404058 | |
parent | 0107f5ba87ca9427500d0fc42ec80a1f3fca9fdb (diff) | |
download | vim-git-e5c5f0c66c9491aca013f30da6e4f730a7ba7db6.tar.gz |
patch 7.4.990v7.4.990
Problem: Test 86 fails on AppVeyor.
Solution: Do some registry magic. (Ken Takata)
-rw-r--r-- | appveyor.yml | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 990, +/**/ 989, /**/ 988, |