diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-04-20 01:36:30 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-04-20 01:36:30 -0400 |
| commit | a7a0bf54e3f339f7bf1f97dee44546cdcd926b1d (patch) | |
| tree | 53e7800fd7d70d4b066d2ad228289301b7b6684e | |
| parent | cd10cdd1b4957eeb1240cc013a904f5a1a25e878 (diff) | |
| parent | 7029dec0ae82338ec6dd26325c94d46287a19828 (diff) | |
| download | rneovim-a7a0bf54e3f339f7bf1f97dee44546cdcd926b1d.tar.gz rneovim-a7a0bf54e3f339f7bf1f97dee44546cdcd926b1d.tar.bz2 rneovim-a7a0bf54e3f339f7bf1f97dee44546cdcd926b1d.zip | |
Merge pull request #4610 from KillTheMule/vim-7.4.819
vim-patch:7.4.819
| -rw-r--r-- | src/nvim/testdir/test17.in | 26 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in index 7fef87d383..a8c81b832d 100644 --- a/src/nvim/testdir/test17.in +++ b/src/nvim/testdir/test17.in @@ -41,17 +41,17 @@ STARTTEST :!mkdir Xdir1 :!mkdir "Xdir1/dir2" :e! Xdir1/dir2/foo.a -i#include "bar.a" +i#include "bar.a": :w :e Xdir1/dir2/bar.a -i#include "baz.a" +i#include "baz.a": :w :e Xdir1/dir2/baz.a -i#include "foo.a" +i#include "foo.a": :w :e Xbase.a :set path=Xdir1/dir2 -i#include <foo.a> +i#include <foo.a>: :w :redir! >>test.out :checkpath! @@ -71,17 +71,17 @@ STARTTEST :endfunction :let &includeexpr='DotsToSlashes()' :e! Xdir1/dir2/foo.b -i%inc /bar/ +i%inc /bar/: :w :e Xdir1/dir2/bar.b -i%inc /baz/ +i%inc /baz/: :w :e Xdir1/dir2/baz.b -i%inc /foo/ +i%inc /foo/: :w :e Xbase.b :set path=Xdir1/dir2 -i%inc /foo/ +i%inc /foo/: :w :redir! >>test.out :checkpath! @@ -104,20 +104,20 @@ STARTTEST :endfunction :let &includeexpr='StripNewlineChar()' :e! Xdir1/dir2/foo.c -i%inc bar.c +i%inc bar.c: :w :e Xdir1/dir2/bar.c -i%inc baz.c +i%inc baz.c: :w :e Xdir1/dir2/baz.c -i%inc foo.c +i%inc foo.c: :w :e Xdir1/dir2/FALSE.c -i%inc foo.c +i%inc foo.c: :w :e Xbase.c :set path=Xdir1/dir2 -i%inc FALSE.c foo.c +i%inc FALSE.c foo.c: :w :redir! >>test.out :checkpath! diff --git a/src/nvim/version.c b/src/nvim/version.c index 7b7d711cec..afd5639d30 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -545,7 +545,7 @@ static int included_patches[] = { // 822, // 821 NA 820, - // 819, + 819, 818, 817, 816, |