diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-22 16:29:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-22 16:29:06 +0200 |
| commit | b777618d111e51b55ee452d3881d5ef5bc836765 (patch) | |
| tree | de65165b94ce31243a9912201890d1cf22017a73 | |
| parent | e4c21e6899b6e4d9d4e0b29fc43c604edd3bc507 (diff) | |
| download | vim-git-b777618d111e51b55ee452d3881d5ef5bc836765.tar.gz | |
updated for version 7.4.304v7.4.304
Problem: Cannot always use Python with Vim.
Solution: Add the manifest to the executable. (Jacques Germishuys)
| -rw-r--r-- | src/Make_mvc.mak | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index ab0289013..4a979e419 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -973,6 +973,7 @@ $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) \ $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) + if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 $(VIM): $(VIM).exe diff --git a/src/version.c b/src/version.c index efdb1964b..0578a7d4d 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 304, +/**/ 303, /**/ 302, |