To: vim-dev@vim.org
Subject: Patch 6.3b.001 (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.3b.001 (extra)
Problem:    Bcc 5: The generated auto/pathdef can't be compiled.
Solution:   Fix the way quotes and backslashes are escaped.
Files:	    src/Make_bc5.mak


*** ../vim-6.3b.000/src/Make_bc5.mak	Sun May 16 22:38:45 2004
--- src/Make_bc5.mak	Tue May 18 13:55:00 2004
***************
*** 927,932 ****
--- 927,937 ----
  $(OBJDIR)\pathdef.obj:	auto\pathdef.c
  	$(CC) $(CCARG) $(CC1) $(CC2)$@ auto\pathdef.c
  
+ 
+ # Need to escape both quotes and backslashes in $INTERP_DEFINES
+ INTERP_DEFINES_ESC_BKS=$(INTERP_DEFINES:\=\\)
+ INTERP_DEFINES_ESC=$(INTERP_DEFINES_ESC_BKS:"=\")
+ 
  # Note:  the silly /*"*/ below are there to trick make into accepting
  # the # character as something other than a comment without messing up
  # the preprocessor directive.
***************
*** 939,945 ****
  
  char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)";
  char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)";
! char_u *all_cflags = (char_u *)"$(CC:\=\\) $(CFLAGS:\=\\) $(DEFINES) $(MBDEFINES) $(INTERP_DEFINES:\=\\) $(OPT) $(EXETYPE) $(CPUARG) $(ALIGNARG) $(DEBUG_FLAG) $(CODEGUARD_FLAG)";
  char_u *all_lflags = (char_u *)"$(LINK:\=\\) $(LFLAGS:\=\\)";
  char_u *compiled_user = (char_u *)"$(USERNAME)";
  char_u *compiled_sys = (char_u *)"$(USERDOMAIN)";
--- 944,950 ----
  
  char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)";
  char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)";
! char_u *all_cflags = (char_u *)"$(CC:\=\\) $(CFLAGS:\=\\) $(DEFINES) $(MBDEFINES) $(INTERP_DEFINES_ESC) $(OPT) $(EXETYPE) $(CPUARG) $(ALIGNARG) $(DEBUG_FLAG) $(CODEGUARD_FLAG)";
  char_u *all_lflags = (char_u *)"$(LINK:\=\\) $(LFLAGS:\=\\)";
  char_u *compiled_user = (char_u *)"$(USERNAME)";
  char_u *compiled_sys = (char_u *)"$(USERDOMAIN)";
*** ../vim-6.3b.000/src/version.c	Sun May 16 22:38:45 2004
--- src/version.c	Tue May 18 13:57:54 2004
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     1,
  /**/

-- 
Mental Floss prevents moral decay!

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///