Mercurial > vim
changeset 1072:25154b22dc96 v7.0.198
updated for version 7.0-198
| author | vimboss |
|---|---|
| date | Tue, 20 Feb 2007 02:16:18 +0000 |
| parents | cc03a79fdbb9 |
| children | ec7a570696ac |
| files | src/Make_mvc.mak src/eval.c src/gvim.exe.mnf src/misc2.c src/version.c |
| diffstat | 5 files changed, 12 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -683,7 +683,7 @@ CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES) # on a crash (doesn't add overhead to the executable). # CFLAGS = $(CFLAGS) /Zi /Fd$(OUTDIR)/ -LINK_PDB = /PDB:$(OUTDIR)/$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup +LINK_PDB = /PDB:$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup # # End extra feature include @@ -761,7 +761,6 @@ clean: - if exist $(VIM).pdb del $(VIM).pdb - if exist $(VIM).map del $(VIM).map - if exist $(VIM).ncb del $(VIM).ncb - - if exist gvim.exe.mnf del gvim.exe.mnf - if exist vimrun.exe del vimrun.exe - if exist install.exe del install.exe - if exist uninstal.exe del uninstal.exe @@ -943,7 +942,7 @@ if_perl.c : if_perl.xs typemap $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c $(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c -$(OUTDIR)/vim.res: $(OUTDIR) gvim.exe.mnf vim.rc version.h tools.bmp tearoff.bmp \ +$(OUTDIR)/vim.res: $(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \ vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico $(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc @@ -961,6 +960,7 @@ dimm.h dimm_i.c: dimm.idl # $CFLAGS may contain backslashes and double quotes, escape them both. E0_CFLAGS = $(CFLAGS:\=\\) E_CFLAGS = $(E0_CFLAGS:"=\") +# ") stop the string $(PATHDEF_SRC): auto @echo creating $(PATHDEF_SRC) @@ -973,30 +973,6 @@ E_CFLAGS = $(E0_CFLAGS:"=\") @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC) @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC) -gvim.exe.mnf: auto - @echo ^<?xml version="1.0" encoding="UTF-8" standalone="yes"?^> >$@ - @echo ^<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"^> >>$@ - @echo ^<assemblyIdentity >>$@ - @echo processorArchitecture="$(ASSEMBLY_ARCHITECTURE)" >>$@ - @echo version="7.0.0.0" >>$@ - @echo type="win32" >>$@ - @echo name="Vim" >>$@ - @echo /^> >>$@ - @echo ^<description^>Vi Improved - A Text Editor^</description^> >>$@ - @echo ^<dependency^> >>$@ - @echo ^<dependentAssembly^> >>$@ - @echo ^<assemblyIdentity >>$@ - @echo type="win32" >>$@ - @echo name="Microsoft.Windows.Common-Controls" >>$@ - @echo version="6.0.0.0" >>$@ - @echo publicKeyToken="6595b64144ccf1df" >>$@ - @echo language="*" >>$@ - @echo processorArchitecture="$(ASSEMBLY_ARCHITECTURE)" >>$@ - @echo /^> >>$@ - @echo ^</dependentAssembly^> >>$@ - @echo ^</dependency^> >>$@ - @echo ^</assembly^> >>$@ - auto: if not exist auto/nul mkdir auto
--- a/src/eval.c +++ b/src/eval.c @@ -1004,7 +1004,7 @@ var_redir_str(value, value_len) if (ga_grow(&redir_ga, (int)len) == OK) { mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len); - redir_ga.ga_len += len; + redir_ga.ga_len += (int)len; } else var_redir_stop(); @@ -10307,7 +10307,7 @@ f_getqflist(argvars, rettv) win_T *wp; #endif - rettv->vval.v_number = FALSE; + rettv->vval.v_number = 0; #ifdef FEAT_QUICKFIX if (rettv_list_alloc(rettv) == OK) {
--- a/src/gvim.exe.mnf +++ b/src/gvim.exe.mnf @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - processorArchitecture="X86" - version="6.2.0.0" + processorArchitecture="*" + version="7.0.0.0" type="win32" name="Vim" /> @@ -15,7 +15,7 @@ version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" - processorArchitecture="X86" + processorArchitecture="*" /> </dependentAssembly> </dependency>
--- a/src/misc2.c +++ b/src/misc2.c @@ -1246,7 +1246,7 @@ vim_strsave_shellescape(string) char_u *escaped_string; /* First count the number of extra bytes required. */ - length = STRLEN(string) + 3; /* two quotes and the trailing NUL */ + length = (unsigned)STRLEN(string) + 3; /* two quotes and a trailing NUL */ for (p = string; *p != NUL; mb_ptr_adv(p)) { # if defined(WIN32) || defined(WIN16) || defined(DOS) @@ -3718,7 +3718,7 @@ get_crypt_key(store, twice) * * ATTENTION: * ========== - * Also we use an allocated search context here, this functions ARE NOT + * Also we use an allocated search context here, this functions are NOT * thread-safe!!!!! * * To minimize parameter passing (or because I'm to lazy), only the