]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.125.patch0
Merge remote-tracking branch 'ms/openvswitch'
[ipfire-3.x.git] / vim / patches / vim-7.3.125.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.125
3 Fcc: outbox
4 From: Bram Moolenaar <Bram@moolenaar.net>
5 Mime-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8 ------------
9
10 Patch 7.3.125
11 Problem: MSVC: Problem with quotes in link argument.
12 Solution: Escape backslashes and quotes. (Weasley)
13 Files: src/Make_mvc.mak
14
15
16 *** ../vim-7.3.124/src/Make_mvc.mak 2010-12-08 14:54:58.000000000 +0100
17 --- src/Make_mvc.mak 2011-02-15 17:55:24.000000000 +0100
18 ***************
19 *** 1159,1164 ****
20 --- 1159,1168 ----
21 E0_CFLAGS = $(CFLAGS:\=\\)
22 E_CFLAGS = $(E0_CFLAGS:"=\")
23 # ") stop the string
24 + # $LINKARGS2 may contain backslashes and double quotes, escape them both.
25 + E0_LINKARGS2 = $(LINKARGS2:\=\\)
26 + E_LINKARGS2 = $(E0_LINKARGS2:"=\")
27 + # ") stop the string
28
29 $(PATHDEF_SRC): auto
30 @echo creating $(PATHDEF_SRC)
31 ***************
32 *** 1167,1173 ****
33 @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)
34 @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)
35 @echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)
36 ! @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(LINKARGS2:\=\\)"; >> $(PATHDEF_SRC)
37 @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)
38 @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)
39
40 --- 1171,1177 ----
41 @echo char_u *default_vim_dir = (char_u *)"$(VIMRCLOC:\=\\)"; >> $(PATHDEF_SRC)
42 @echo char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR:\=\\)"; >> $(PATHDEF_SRC)
43 @echo char_u *all_cflags = (char_u *)"$(CC:\=\\) $(E_CFLAGS)"; >> $(PATHDEF_SRC)
44 ! @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(E_LINKARGS2)"; >> $(PATHDEF_SRC)
45 @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)
46 @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)
47
48 *** ../vim-7.3.124/src/version.c 2011-02-15 17:39:14.000000000 +0100
49 --- src/version.c 2011-02-15 17:55:49.000000000 +0100
50 ***************
51 *** 716,717 ****
52 --- 716,719 ----
53 { /* Add new patch number below this line */
54 + /**/
55 + 125,
56 /**/
57
58 --
59 hundred-and-one symptoms of being an internet addict:
60 271. You collect hilarious signatures from all 250 mailing lists you
61 are subscribed to.
62
63 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
64 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
65 \\\ an exciting new programming language -- http://www.Zimbu.org ///
66 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///