diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-26 00:01:46 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-26 00:01:46 -0400 |
| commit | e861af85f89e119193a9e219a4cb766757e28e5a (patch) | |
| tree | ba0265cb7075923c5f0d57e469131ef0dd7c2874 /src | |
| parent | 17294977bdb31462e488387e3e28030452bd5686 (diff) | |
| parent | ef977c6b688757a82b0ffd8eb23b78761f791982 (diff) | |
| download | rneovim-e861af85f89e119193a9e219a4cb766757e28e5a.tar.gz rneovim-e861af85f89e119193a9e219a4cb766757e28e5a.tar.bz2 rneovim-e861af85f89e119193a9e219a4cb766757e28e5a.zip | |
Merge pull request #4647 from justinmk/vimpatches
version.c: update NA; vim-patch:7.4.998
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test49.in | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/testdir/test49.in b/src/nvim/testdir/test49.in index 1ce57246ee..d95052e14c 100644 --- a/src/nvim/testdir/test49.in +++ b/src/nvim/testdir/test49.in @@ -8,7 +8,9 @@ STARTTEST :se nomore :lang mess C :so test49.vim -GGGGGGGGGGGGGG"rp:.-,$w! test.out +:" Go back to this file and append the results from register r. +:buf test49.in +G"rp:/^Results/,$w! test.out :" :" make valgrind happy :redir => funclist diff --git a/src/nvim/version.c b/src/nvim/version.c index e07c4a242a..a492c8d7ec 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -679,7 +679,7 @@ static int included_patches[] = { 1001, 1000, // 999 NA - // 998, + 998, // 997 NA // 996 NA // 995 NA @@ -694,7 +694,7 @@ static int included_patches[] = { // 986 NA // 985 NA 984, - // 983, + // 983 NA // 982 NA 981, 980, @@ -880,7 +880,7 @@ static int included_patches[] = { 800, 799, 798, - // 797, + // 797 NA // 796 NA 795, // 794 NA @@ -944,7 +944,7 @@ static int included_patches[] = { 736, // 735 NA 734, - // 733, + // 733 NA 732, // 731 NA // 730 NA |