To: vim_dev@googlegroups.com

Subject: Patch 7.3.125

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.125

Problem:    MSVC: Problem with quotes in link argument.

Solution:   Escape backslashes and quotes. (Weasley)

Files:	    src/Make_mvc.mak

*** ../vim-7.3.124/src/Make_mvc.mak	2010-12-08 14:54:58.000000000 +0100

--- src/Make_mvc.mak	2011-02-15 17:55:24.000000000 +0100

***************

*** 1159,1164 ****

--- 1159,1168 ----

  E0_CFLAGS = $(CFLAGS:\=\\)

  E_CFLAGS = $(E0_CFLAGS:"=\")

  # ") stop the string

+ # $LINKARGS2 may contain backslashes and double quotes, escape them both.

+ E0_LINKARGS2 = $(LINKARGS2:\=\\)

+ E_LINKARGS2 = $(E0_LINKARGS2:"=\")

+ # ") stop the string

  $(PATHDEF_SRC): auto

  	@echo creating $(PATHDEF_SRC)

***************

*** 1167,1173 ****

  	@echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)

  	@echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)

  	@echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)

! 	@echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(LINKARGS2:\=\\)"; >> $(PATHDEF_SRC)

  	@echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)

  	@echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)

--- 1171,1177 ----

  	@echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)

  	@echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)

  	@echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)

! 	@echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(E_LINKARGS2)"; >> $(PATHDEF_SRC)

  	@echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)

  	@echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)

*** ../vim-7.3.124/src/version.c	2011-02-15 17:39:14.000000000 +0100

--- src/version.c	2011-02-15 17:55:49.000000000 +0100

***************

*** 716,717 ****

--- 716,719 ----

  {   /* Add new patch number below this line */

+ /**/

+     125,

  /**/

-- 

hundred-and-one symptoms of being an internet addict:

271. You collect hilarious signatures from all 250 mailing lists you

     are subscribed to.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\  an exciting new programming language -- http://www.Zimbu.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///