]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - vim/patches/vim-7.3.435.patch0
Merge remote-tracking branch 'stevee/openvswitch-systemd'
[people/amarx/ipfire-3.x.git] / vim / patches / vim-7.3.435.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.435
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.435
11 Problem: Compiler warning for unused variable.
12 Solution: Move the variable inside #ifdef.
13 Files: src/ex_cmds2.c
14
15
16 *** ../vim-7.3.434/src/ex_cmds2.c 2012-02-05 23:10:25.000000000 +0100
17 --- src/ex_cmds2.c 2012-02-06 06:16:28.000000000 +0100
18 ***************
19 *** 3400,3406 ****
20 {
21 struct source_cookie *sp = (struct source_cookie *)cookie;
22 char_u *line;
23 ! char_u *p, *s;
24
25 #ifdef FEAT_EVAL
26 /* If breakpoints have been added/deleted need to check for it. */
27 --- 3400,3406 ----
28 {
29 struct source_cookie *sp = (struct source_cookie *)cookie;
30 char_u *line;
31 ! char_u *p;
32
33 #ifdef FEAT_EVAL
34 /* If breakpoints have been added/deleted need to check for it. */
35 ***************
36 *** 3471,3476 ****
37 --- 3471,3478 ----
38 #ifdef FEAT_MBYTE
39 if (line != NULL && sp->conv.vc_type != CONV_NONE)
40 {
41 + char_u *s;
42 +
43 /* Convert the encoding of the script line. */
44 s = string_convert(&sp->conv, line, NULL);
45 if (s != NULL)
46 *** ../vim-7.3.434/src/version.c 2012-02-06 00:13:16.000000000 +0100
47 --- src/version.c 2012-02-11 20:38:49.000000000 +0100
48 ***************
49 *** 716,717 ****
50 --- 716,719 ----
51 { /* Add new patch number below this line */
52 + /**/
53 + 435,
54 /**/
55
56 --
57 Light travels faster than sound. This is why some people
58 appear bright until you hear them speak
59
60 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
61 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
62 \\\ an exciting new programming language -- http://www.Zimbu.org ///
63 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///