OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • SSH
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Révision9fbb40a1228a4d8a5f26d1dff8e2ab4e3bd870fe (tree)
l'heure2008-03-16 22:54:13
Auteurvimboss
Commitervimboss

Message de Log

updated for version 7.1-282

Change Summary

Modification

diff -r 4e581f1b08da -r 9fbb40a1228a src/GvimExt/Makefile
--- a/src/GvimExt/Makefile Sun Mar 16 12:09:58 2008 +0000
+++ b/src/GvimExt/Makefile Sun Mar 16 13:54:13 2008 +0000
@@ -24,7 +24,7 @@
2424 gvimext.obj: gvimext.h
2525
2626 .cpp.obj:
27- $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsdll) $*.cpp
27+ $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
2828
2929 gvimext.res: gvimext.rc
3030 $(rc) $(rcflags) $(rcvars) gvimext.rc
diff -r 4e581f1b08da -r 9fbb40a1228a src/INSTALLpc.txt
--- a/src/INSTALLpc.txt Sun Mar 16 12:09:58 2008 +0000
+++ b/src/INSTALLpc.txt Sun Mar 16 13:54:13 2008 +0000
@@ -82,9 +82,8 @@
8282 |ms-platform-sdk|, |dotnet-1.1-redist|, |dotnet-1.1-sdk|,
8383 and |windbg-download|.
8484
85-It's easier to download Visual C++ 2005 Express Edition, |msvc-2005-express|.
86-The advantage of the VC 2003 Toolkit is that it will be freely available
87-long after VC 2005 Express Edition stops being free in November 2006.
85+It's easier to download Visual C++ 2008 Express Edition, |msvc-2008-express|,
86+which is freely available in perpetuity.
8887
8988 The free Code::Blocks IDE works with the VC2003 Toolkit, as described at
9089 http://wiki.codeblocks.org/index.php?title=Integrating_Microsoft_Visual_Toolkit_2003_with_Code::Blocks_IDE
@@ -152,6 +151,14 @@
152151 http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx
153152
154153
154+Visual C++ 2008 Express Edition *msvc-2008-express*
155+-------------------------------
156+
157+Visual C++ 2008 Express Edition can be downloaded for free from:
158+ http://msdn2.microsoft.com/en-us/express/default.aspx
159+This includes the IDE and the debugger. You can build Vim with Make_mvc.mak.
160+
161+
155162 2. MinGW
156163 ========
157164
diff -r 4e581f1b08da -r 9fbb40a1228a src/Make_mvc.mak
--- a/src/Make_mvc.mak Sun Mar 16 12:09:58 2008 +0000
+++ b/src/Make_mvc.mak Sun Mar 16 13:54:13 2008 +0000
@@ -1,6 +1,7 @@
11 # Makefile for Vim on Win32 (Windows NT/2000/XP/2003 and Windows 95/98/Me)
22 # and Win64, using the Microsoft Visual C++ compilers. Known to work with
3-# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), and VC8 (VS2005).
3+# VC5, VC6 (VS98), VC7.0 (VS2002), VC7.1 (VS2003), VC8 (VS2005),
4+# and VC9 (VS2008).
45 #
56 # To build using other Windows compilers, see INSTALLpc.txt
67 #
@@ -285,7 +286,8 @@
285286 # need shell32.lib for ExtractIcon()
286287 # gdi32.lib and comdlg32.lib for printing support
287288 # ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
288-CON_LIB = advapi32.lib shell32.lib gdi32.lib comdlg32.lib ole32.lib uuid.lib
289+CON_LIB = oldnames.lib kernel32.lib advapi32.lib shell32.lib gdi32.lib \
290+ comdlg32.lib ole32.lib uuid.lib /machine:$(CPU) /nodefaultlib
289291 !if "$(DELAYLOAD)" == "yes"
290292 CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
291293 !endif
@@ -331,6 +333,7 @@
331333 !endif
332334 !if "$(_NMAKE_VER)" == "6.00.8168.0"
333335 MSVCVER = 6.0
336+CPU = ix86
334337 !endif
335338 !if "$(_NMAKE_VER)" == "7.00.9466"
336339 MSVCVER = 7.0
@@ -344,6 +347,9 @@
344347 !if "$(_NMAKE_VER)" == "8.00.50727.762"
345348 MSVCVER = 8.0
346349 !endif
350+!if "$(_NMAKE_VER)" == "9.00.20706.01"
351+MSVCVER = 9.0
352+!endif
347353 !endif
348354
349355 # Abort bulding VIM if version of VC is unrecognised.
@@ -352,13 +358,13 @@
352358 !message Cannot determine Visual C version being used. If you are using the
353359 !message Windows SDK then you must have the environment variable MSVCVER set to
354360 !message your version of the VC compiler. If you are not using the Express
355-!message version of Visual C you van either set MSVCVER or update this makefile
356-!message to handle the new value for _NMAKE_VER.
361+!message version of Visual C, you can either set MSVCVER or update this makefile
362+!message to handle the new value for _NMAKE_VER, "$(_NMAKE_VER)".
357363 !error Make aborted.
358364 !endif
359365
360366 # Convert processor ID to MVC-compatible number
361-!if "$(MSVCVER)" != "8.0"
367+!if ("$(MSVCVER)" != "8.0") && ("$(MSVCVER)" != "9.0")
362368 !if "$(CPUNR)" == "i386"
363369 CPUARG = /G3
364370 !elseif "$(CPUNR)" == "i486"
@@ -373,7 +379,7 @@
373379 CPUARG =
374380 !endif
375381 !else
376-# VC8 only allows specifying SSE architecture
382+# VC8/9 only allows specifying SSE architecture
377383 !if "$(CPUNR)" == "pentium4"
378384 CPUARG = /arch:SSE2
379385 !endif
@@ -391,7 +397,7 @@
391397 !else # MAXSPEED
392398 OPTFLAG = /Ox
393399 !endif
394-!if "$(MSVCVER)" == "8.0"
400+!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
395401 # Use link time code generation if not worried about size
396402 !if "$(OPTIMIZE)" != "SPACE"
397403 OPTFLAG = $(OPTFLAG) /GL
@@ -404,11 +410,11 @@
404410 LIBC = msvcrt.lib
405411 ! else
406412 LIBC = libcmt.lib
407-CFLAGS = $(CFLAGS) /MT
413+CFLAGS = $(CFLAGS) /Zl /MT
408414 ! endif
409415 !else # DEBUG
410416 VIM = vimd
411-! if "$(CPU)" == "i386"
417+! if ("$(CPU)" == "i386") || ("$(CPU)" == "ix86")
412418 DEBUGINFO = /ZI
413419 ! endif
414420 CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
@@ -424,7 +430,7 @@
424430 LIBC = $(LIBC) msvcrtd.lib
425431 ! else
426432 LIBC = $(LIBC) libcmtd.lib
427-CFLAGS = $(CFLAGS) /MTd
433+CFLAGS = $(CFLAGS) /Zl /MTd
428434 ! endif
429435 !endif # DEBUG
430436
@@ -534,7 +540,7 @@
534540 $(OUTDIR)\gui_w32.obj \
535541 $(OUTDIR)\os_w32exe.obj
536542 GUI_LIB = \
537- oldnames.lib kernel32.lib gdi32.lib version.lib $(IME_LIB) \
543+ gdi32.lib version.lib $(IME_LIB) \
538544 winspool.lib comctl32.lib advapi32.lib shell32.lib \
539545 /machine:$(CPU) /nodefaultlib
540546 !else
@@ -757,7 +763,7 @@
757763
758764 # Report link time code generation progress if used.
759765 !ifdef NODEBUG
760-!if "$(MSVCVER)" == "8.0"
766+!if ("$(MSVCVER)" == "8.0") || ("$(MSVCVER)" == "9.0")
761767 !if "$(OPTIMIZE)" != "SPACE"
762768 LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
763769 !endif
diff -r 4e581f1b08da -r 9fbb40a1228a src/dosinst.c
--- a/src/dosinst.c Sun Mar 16 12:09:58 2008 +0000
+++ b/src/dosinst.c Sun Mar 16 13:54:13 2008 +0000
@@ -1365,7 +1365,7 @@
13651365
13661366 printf("Creating \"Edit with Vim\" popup menu entry\n");
13671367
1368- fprintf(fd, "HKEY_CLASSES_ROOT\\CLSID\\%s\n", vim_ext_clsid);
1368+ fprintf(fd, "[HKEY_CLASSES_ROOT\\CLSID\\%s]\n", vim_ext_clsid);
13691369 fprintf(fd, "@=\"%s\"\n", vim_ext_name);
13701370 fprintf(fd, "[HKEY_CLASSES_ROOT\\CLSID\\%s\\InProcServer32]\n",
13711371 vim_ext_clsid);
diff -r 4e581f1b08da -r 9fbb40a1228a src/if_ole.cpp
--- a/src/if_ole.cpp Sun Mar 16 12:09:58 2008 +0000
+++ b/src/if_ole.cpp Sun Mar 16 13:54:13 2008 +0000
@@ -34,6 +34,12 @@
3434 extern HWND vim_parent_hwnd;
3535 }
3636
37+#if _MSC_VER < 1300
38+/* Work around old versions of basetsd.h which wrongly declares
39+ * UINT_PTR as unsigned long */
40+# define UINT_PTR UINT
41+#endif
42+
3743 #include "if_ole.h" // Interface definitions
3844 #include "iid_ole.c" // UUID definitions (compile here)
3945
@@ -107,7 +113,7 @@
107113 STDMETHOD(SendKeys)(BSTR keys);
108114 STDMETHOD(Eval)(BSTR expr, BSTR *result);
109115 STDMETHOD(SetForeground)(void);
110- STDMETHOD(GetHwnd)(UINT *result);
116+ STDMETHOD(GetHwnd)(UINT_PTR *result);
111117
112118 private:
113119 // Constructor is private - create using CVim::Create()
@@ -288,9 +294,9 @@
288294 }
289295
290296 STDMETHODIMP
291-CVim::GetHwnd(UINT *result)
297+CVim::GetHwnd(UINT_PTR *result)
292298 {
293- *result = (UINT) s_hwnd;
299+ *result = (UINT_PTR)s_hwnd;
294300 return S_OK;
295301 }
296302
diff -r 4e581f1b08da -r 9fbb40a1228a src/if_ole.h
--- a/src/if_ole.h Sun Mar 16 12:09:58 2008 +0000
+++ b/src/if_ole.h Sun Mar 16 13:54:13 2008 +0000
@@ -79,7 +79,7 @@
7979 virtual HRESULT STDMETHODCALLTYPE SetForeground( void) = 0;
8080
8181 virtual HRESULT STDMETHODCALLTYPE GetHwnd(
82- /* [retval][out] */ UINT __RPC_FAR *result) = 0;
82+ /* [retval][out] */ UINT_PTR __RPC_FAR *result) = 0;
8383
8484 };
8585
@@ -143,7 +143,7 @@
143143
144144 HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetHwnd )(
145145 IVim __RPC_FAR * This,
146- /* [retval][out] */ UINT __RPC_FAR *result);
146+ /* [retval][out] */ UINT_PTR __RPC_FAR *result);
147147
148148 END_INTERFACE
149149 } IVimVtbl;
@@ -236,7 +236,7 @@
236236
237237 HRESULT STDMETHODCALLTYPE IVim_GetHwnd_Proxy(
238238 IVim __RPC_FAR * This,
239- /* [retval][out] */ UINT __RPC_FAR *result);
239+ /* [retval][out] */ UINT_PTR __RPC_FAR *result);
240240
241241
242242 void __RPC_STUB IVim_GetHwnd_Stub(
diff -r 4e581f1b08da -r 9fbb40a1228a src/if_ole.idl
--- a/src/if_ole.idl Sun Mar 16 12:09:58 2008 +0000
+++ b/src/if_ole.idl Sun Mar 16 13:54:13 2008 +0000
@@ -20,7 +20,7 @@
2020 HRESULT SendKeys([in]BSTR keys);
2121 HRESULT Eval([in]BSTR expr, [out, retval]BSTR* result);
2222 HRESULT SetForeground(void);
23- HRESULT GetHwnd([out, retval]UINT* result);
23+ HRESULT GetHwnd([out, retval]UINT_PTR* result);
2424 };
2525
2626 // Component and type library definitions
diff -r 4e581f1b08da -r 9fbb40a1228a src/os_win32.c
--- a/src/os_win32.c Sun Mar 16 12:09:58 2008 +0000
+++ b/src/os_win32.c Sun Mar 16 13:54:13 2008 +0000
@@ -2856,7 +2856,7 @@
28562856 windgoto((int)Rows - 1, 0);
28572857 g_fForceExit = TRUE;
28582858
2859- sprintf((char *)IObuff, _("Vim: Caught %s event\n"),
2859+ vim_snprintf((char *)IObuff, IOSIZE, _("Vim: Caught %s event\n"),
28602860 (dwCtrlType == CTRL_CLOSE_EVENT
28612861 ? _("close")
28622862 : dwCtrlType == CTRL_LOGOFF_EVENT
@@ -3282,12 +3282,13 @@
32823282 {
32833283 /* we use "command" or "cmd" to start the shell; slow but easy */
32843284 char_u *newcmd;
3285-
3286- newcmd = lalloc((long_u) (
3285+ long_u cmdlen = (
32873286 #ifdef FEAT_GUI_W32
32883287 STRLEN(vimrun_path) +
32893288 #endif
3290- STRLEN(p_sh) + STRLEN(p_shcf) + STRLEN(cmd) + 10), TRUE);
3289+ STRLEN(p_sh) + STRLEN(p_shcf) + STRLEN(cmd) + 10);
3290+
3291+ newcmd = lalloc(cmdlen, TRUE);
32913292 if (newcmd != NULL)
32923293 {
32933294 char_u *cmdbase = (*cmd == '"' ? cmd + 1 : cmd);
@@ -3373,14 +3374,15 @@
33733374 if (!s_dont_use_vimrun)
33743375 /* Use vimrun to execute the command. It opens a console
33753376 * window, which can be closed without killing Vim. */
3376- sprintf((char *)newcmd, "%s%s%s %s %s",
3377+ vim_snprintf((char *)newcmd, cmdlen, "%s%s%s %s %s",
33773378 vimrun_path,
33783379 (msg_silent != 0 || (options & SHELL_DOOUT))
33793380 ? "-s " : "",
33803381 p_sh, p_shcf, cmd);
33813382 else
33823383 #endif
3383- sprintf((char *)newcmd, "%s %s %s", p_sh, p_shcf, cmd);
3384+ vim_snprintf((char *)newcmd, cmdlen, "%s %s %s",
3385+ p_sh, p_shcf, cmd);
33843386 x = mch_system((char *)newcmd, options);
33853387 }
33863388 vim_free(newcmd);
@@ -4664,12 +4666,29 @@
46644666 # endif
46654667 )
46664668 {
4669+# if defined(DEBUG) && _MSC_VER > 1200
4670+ /* Work around an annoying assertion in the Microsoft debug CRT
4671+ * when mode's text/binary setting doesn't match _get_fmode(). */
4672+ char newMode = mode[strlen(mode) - 1];
4673+ int oldMode = 0;
4674+
4675+ _get_fmode(&oldMode);
4676+ if (newMode == 't')
4677+ _set_fmode(_O_TEXT);
4678+ else if (newMode == 'b')
4679+ _set_fmode(_O_BINARY);
4680+# endif
46674681 wn = enc_to_ucs2(name, NULL);
46684682 wm = enc_to_ucs2(mode, NULL);
46694683 if (wn != NULL && wm != NULL)
46704684 f = _wfopen(wn, wm);
46714685 vim_free(wn);
46724686 vim_free(wm);
4687+
4688+# if defined(DEBUG) && _MSC_VER > 1200
4689+ _set_fmode(oldMode);
4690+# endif
4691+
46734692 if (f != NULL)
46744693 return f;
46754694 /* Retry with non-wide function (for Windows 98). Can't use
diff -r 4e581f1b08da -r 9fbb40a1228a src/version.c
--- a/src/version.c Sun Mar 16 12:09:58 2008 +0000
+++ b/src/version.c Sun Mar 16 13:54:13 2008 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 282,
671+/**/
670672 281,
671673 /**/
672674 280,
Afficher sur ancien navigateur de dépôt.