diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-12-30 13:43:56 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-12-30 13:43:56 +0100 |
commit | b8cb643eab0e84d6a41f5884c7e41736218425fb (patch) | |
tree | 664142edaf4d14c9a7b9ce8a60c21cf1ff23f1bb | |
parent | f9c8bd2137b045f9a64d63eefcf022b4726b1419 (diff) | |
download | vim-git-b8cb643eab0e84d6a41f5884c7e41736218425fb.tar.gz |
patch 7.4.999v7.4.999
Problem: "make shadow" creates a broken link. (Tony Mechelynck)
Solution: Remove vimrc.unix from the list.
-rw-r--r-- | src/Makefile | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index 7cdf81302..4096e556e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2481,7 +2481,6 @@ shadow: runtime pixmaps mkdir $(SHADOWDIR)/testdir cd $(SHADOWDIR)/testdir; ln -s ../../testdir/Makefile \ ../../testdir/Make_all.mak \ - ../../testdir/vimrc.unix \ ../../testdir/*.in \ ../../testdir/*.vim \ ../../testdir/python* \ diff --git a/src/version.c b/src/version.c index 670c0af77..4216cfdc1 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 */ /**/ + 999, +/**/ 998, /**/ 997, |