]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - vim/patches/vim-7.3.413.patch0
Merge remote-tracking branch 'stevee/openvswitch-systemd'
[people/amarx/ipfire-3.x.git] / vim / patches / vim-7.3.413.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.413
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.413
11 Problem: Build warnings on MS-Windows.
12 Solution: Add type casts. (Mike Williams)
13 Files: src/ex_getln.c, src/message.c, src/term.c
14
15
16 *** ../vim-7.3.412/src/ex_getln.c 2012-01-20 20:44:38.000000000 +0100
17 --- src/ex_getln.c 2012-01-26 12:58:54.000000000 +0100
18 ***************
19 *** 5923,5929 ****
20 hist[i].hisnum);
21 if (vim_strsize(hist[i].hisstr) > (int)Columns - 10)
22 trunc_string(hist[i].hisstr, IObuff + STRLEN(IObuff),
23 ! (int)Columns - 10, IOSIZE - STRLEN(IObuff));
24 else
25 STRCAT(IObuff, hist[i].hisstr);
26 msg_outtrans(IObuff);
27 --- 5923,5929 ----
28 hist[i].hisnum);
29 if (vim_strsize(hist[i].hisstr) > (int)Columns - 10)
30 trunc_string(hist[i].hisstr, IObuff + STRLEN(IObuff),
31 ! (int)Columns - 10, IOSIZE - (int)STRLEN(IObuff));
32 else
33 STRCAT(IObuff, hist[i].hisstr);
34 msg_outtrans(IObuff);
35 *** ../vim-7.3.412/src/message.c 2012-01-23 20:48:34.000000000 +0100
36 --- src/message.c 2012-01-26 12:58:54.000000000 +0100
37 ***************
38 *** 325,331 ****
39 if (e + 3 < buflen)
40 {
41 mch_memmove(buf + e, "...", (size_t)3);
42 ! len = STRLEN(s + i) + 1;
43 if (len >= buflen - e - 3)
44 len = buflen - e - 3 - 1;
45 mch_memmove(buf + e + 3, s + i, len);
46 --- 325,331 ----
47 if (e + 3 < buflen)
48 {
49 mch_memmove(buf + e, "...", (size_t)3);
50 ! len = (int)STRLEN(s + i) + 1;
51 if (len >= buflen - e - 3)
52 len = buflen - e - 3 - 1;
53 mch_memmove(buf + e + 3, s + i, len);
54 *** ../vim-7.3.412/src/term.c 2012-01-20 17:15:47.000000000 +0100
55 --- src/term.c 2012-01-26 12:58:54.000000000 +0100
56 ***************
57 *** 5252,5258 ****
58 char_u *src;
59 {
60 int i;
61 ! int slen = STRLEN(src);
62
63 for (i = 0; i < tc_len; ++i)
64 {
65 --- 5252,5258 ----
66 char_u *src;
67 {
68 int i;
69 ! int slen = (int)STRLEN(src);
70
71 for (i = 0; i < tc_len; ++i)
72 {
73 *** ../vim-7.3.412/src/version.c 2012-01-26 11:45:25.000000000 +0100
74 --- src/version.c 2012-01-26 12:59:14.000000000 +0100
75 ***************
76 *** 716,717 ****
77 --- 716,719 ----
78 { /* Add new patch number below this line */
79 + /**/
80 + 413,
81 /**/
82
83 --
84 It doesn't really matter what you are able to do if you don't do it.
85 (Bram Moolenaar)
86
87 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
88 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
89 \\\ an exciting new programming language -- http://www.Zimbu.org ///
90 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///