IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6486 from jamessan/vim8-patches

Browse Source 
Bump Vim version to 8.0 and applied patches
This commit is contained in:
James McCoy 2017-07-14 06:49:59 -04:00 committed by GitHub
commit da99ded25b
4 changed files with 575 additions and 2290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vim-patch.sh
View File

@ -310,7 +310,7 @@ list_vim_patches() {
# Get missing Vim commits
local vim_commits
vim_commits="$(cd "${VIM_SOURCE_DIR}" && git log --reverse --format='%H' v7.4.1979..HEAD)"
vim_commits="$(cd "${VIM_SOURCE_DIR}" && git log --reverse --format='%H' v8.0.0000..HEAD)"
local vim_commit
for vim_commit in ${vim_commits}; do

2846
src/nvim/version.c
View File

File diff suppressed because it is too large Load Diff

8
src/nvim/version.h
View File

@ -10,14 +10,14 @@ extern char* longVersion;
//
// Vim version number, name, etc. Patchlevel is defined in version.c.
//
#define VIM_VERSION_MAJOR 7
#define VIM_VERSION_MINOR 4
#define VIM_VERSION_MAJOR 8
#define VIM_VERSION_MINOR 0
#define VIM_VERSION_100 (VIM_VERSION_MAJOR * 100 + VIM_VERSION_MINOR)
// used for the runtime directory name
#define VIM_VERSION_NODOT "vim74"
#define VIM_VERSION_NODOT "vim80"
// swap file compatibility (max. length is 6 chars)
#define VIM_VERSION_SHORT "7.4"
#define VIM_VERSION_SHORT "8.0"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "version.h.generated.h"

9
test/functional/plugin/shada_spec.lua
View File

@ -2076,13 +2076,14 @@ describe('In autoload/shada.vim', function()
end
it('works', function()
local version = nvim('get_vvar', 'version')
getbstrings_eq({{timestamp='current', type=1, value={
generator='shada.vim',
version=704,
version=version,
}}}, {})
getbstrings_eq({
{timestamp='current', type=1, value={
generator='shada.vim', version=704
generator='shada.vim', version=version
}},
{timestamp=0, type=1, value={generator='test'}}
}, {
@ -2093,11 +2094,11 @@ describe('In autoload/shada.vim', function()
nvim('set_var', 'shada#add_own_header', 1)
getbstrings_eq({{timestamp='current', type=1, value={
generator='shada.vim',
version=704,
version=version,
}}}, {})
getbstrings_eq({
{timestamp='current', type=1, value={
generator='shada.vim', version=704
generator='shada.vim', version=version
}},
{timestamp=0, type=1, value={generator='test'}}
}, {