To: vim-dev@vim.org Subject: Patch 6.1.424 (extra) Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.1.424 (extra) Problem: Win32: Gvim compiled with VC++ 7.0 run on Windows 95 does not show menu items. Solution: Define $WINVER to avoid an extra item is added to MENUITEMINFO. (Muraoka Taro) Files: src/Make_mvc.mak *** ../vim61.423/src/Make_mvc.mak Mon Feb 17 10:21:47 2003 --- src/Make_mvc.mak Thu Mar 20 22:02:10 2003 *************** *** 182,194 **** CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib !endif # If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal # default, use these lines. #VIMRCLOC = somewhere #VIMRUNTIMEDIR = somewhere CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ ! $(SNIFF_DEFS) $(DEFINES) #>>>>> end of choices ########################################################################### --- 182,199 ---- CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib !endif + ### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET) + !ifndef WINVER + WINVER = -DWINVER=0x400 + !endif + # If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal # default, use these lines. #VIMRCLOC = somewhere #VIMRUNTIMEDIR = somewhere CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ ! $(WINVER) $(SNIFF_DEFS) $(DEFINES) #>>>>> end of choices ########################################################################### *** ../vim61.423/src/version.c Fri Mar 28 22:01:46 2003 --- src/version.c Mon Mar 31 20:03:30 2003 *************** *** 613,614 **** --- 613,616 ---- { /* Add new patch number below this line */ + /**/ + 424, /**/ -- MAN: Fetchez la vache! GUARD: Quoi? MAN: Fetchez la vache! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///