To: vim-dev@vim.org
Subject: Patch 6.1.100 (extra)
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.100 (extra, depends on 6.1.088)
Problem:    Win32: VC5 and earlier don't support the /mapinfo option.
Solution:   Add "/mapinfo" only when "MAP=lines" is specified. (Muraoka Taro)
Files:	    src/Make_mvc.mak


*** ../vim61.099/src/Make_mvc.mak	Thu Jun  6 20:50:44 2002
--- src/Make_mvc.mak	Tue Jun 18 19:46:43 2002
***************
*** 39,44 ****
--- 39,48 ----
  #	  TCL_VER_LONG=[Tcl version, eg 8.3] (default is 8.3)
  #	    You must set TCL_VER_LONG when you set TCL_VER.
  #	Debug version: DEBUG=yes
+ #	Mapfile: MAP=[no, yes or lines] (default is yes)
+ #	  no:    Don't write a mapfile.
+ #	  yes:   Write a normal mapfile.
+ #	  lines: Write a mapfile with line numbers (only for VC6 and later)
  #	SNiFF+ interface: SNIFF=yes
  #	Iconv library support (always dynamically loaded):
  #	  ICONV=[yes or no]  (default is yes)
***************
*** 479,486 ****
  #
  !message
  
! # "/map /mapinfo:lines" is for debugging
! conflags = /nologo /subsystem:$(SUBSYSTEM) /incremental:no /map /mapinfo:lines
  
  LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc
  LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
--- 483,497 ----
  #
  !message
  
! conflags = /nologo /subsystem:$(SUBSYSTEM) /incremental:no
! 
! !IF "$(MAP)" == "yes"
! # "/map" is for debugging
! conflags = $(conflags) /map
! !ELSEIF "$(MAP)" == "lines"
! # "/mapinfo:lines" is for debugging, only works for VC6 and later
! conflags = $(conflags) /map /mapinfo:lines
! !ENDIF
  
  LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc
  LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB)  user32.lib $(SNIFF_LIB) \
*** ../vim61.099/src/version.c	Tue Jun 18 21:33:22 2002
--- src/version.c	Tue Jun 18 21:35:30 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     100,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
259. When you enter your name in the AltaVista search engine, the top ten
     matches do indeed refer to you.

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///   Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim   \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\  Help me helping AIDS orphans in Uganda - http://iccf-holland.org  ///