]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.316.patch0
vim: Import latest patches from upstream.
[ipfire-3.x.git] / vim / patches / vim-7.3.316.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.316
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.316 (after 7.3.306)
11 Problem: Crash when 'colorcolumn' is set and closing buffer.
12 Solution: Check for w_buffer to be NULL. (Yasuhiro Matsumoto)
13 Files: src/option.c
14
15
16 *** ../vim-7.3.315/src/option.c 2011-06-12 22:13:37.000000000 +0200
17 --- src/option.c 2011-09-21 13:26:31.000000000 +0200
18 ***************
19 *** 7036,7041 ****
20 --- 7036,7044 ----
21 int i;
22 int j = 0;
23
24 + if (wp->w_buffer == NULL)
25 + return NULL; /* buffer was closed */
26 +
27 for (s = wp->w_p_cc; *s != NUL && count < 255;)
28 {
29 if (*s == '-' || *s == '+')
30 *** ../vim-7.3.315/src/version.c 2011-09-14 19:04:35.000000000 +0200
31 --- src/version.c 2011-09-21 13:40:05.000000000 +0200
32 ***************
33 *** 711,712 ****
34 --- 711,714 ----
35 { /* Add new patch number below this line */
36 + /**/
37 + 316,
38 /**/
39
40 --
41 hundred-and-one symptoms of being an internet addict:
42 25. You believe nothing looks sexier than a man in boxer shorts illuminated
43 only by a 17" inch svga monitor.
44
45 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
46 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
47 \\\ an exciting new programming language -- http://www.Zimbu.org ///
48 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///