]> git.ipfire.org Git - people/ms/ipfire-3.x.git/blob - vim/patches/vim-7.3.458.patch0
Merge remote-tracking branch 'ms/openvswitch'
[people/ms/ipfire-3.x.git] / vim / patches / vim-7.3.458.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.458
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.458
11 Problem: Crash when calling smsg() during startup.
12 Solution: Don't use 'shortmess' when it is not set yet.
13 Files: src/option.c
14
15
16 *** ../vim-7.3.457/src/option.c 2012-02-20 22:18:22.000000000 +0100
17 --- src/option.c 2012-02-26 13:14:48.000000000 +0100
18 ***************
19 *** 10984,10990 ****
20 shortmess(x)
21 int x;
22 {
23 ! return ( vim_strchr(p_shm, x) != NULL
24 || (vim_strchr(p_shm, 'a') != NULL
25 && vim_strchr((char_u *)SHM_A, x) != NULL));
26 }
27 --- 10984,10991 ----
28 shortmess(x)
29 int x;
30 {
31 ! return p_shm != NULL &&
32 ! ( vim_strchr(p_shm, x) != NULL
33 || (vim_strchr(p_shm, 'a') != NULL
34 && vim_strchr((char_u *)SHM_A, x) != NULL));
35 }
36 *** ../vim-7.3.457/src/version.c 2012-02-29 13:49:03.000000000 +0100
37 --- src/version.c 2012-02-29 13:50:52.000000000 +0100
38 ***************
39 *** 716,717 ****
40 --- 716,719 ----
41 { /* Add new patch number below this line */
42 + /**/
43 + 458,
44 /**/
45
46 --
47 Support your right to bare arms! Wear short sleeves!
48
49 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
50 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
51 \\\ an exciting new programming language -- http://www.Zimbu.org ///
52 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///