]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - vim/patches/vim-7.3.261.patch0
Merge remote-tracking branch 'stevee/openvswitch-systemd'
[people/amarx/ipfire-3.x.git] / vim / patches / vim-7.3.261.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.261
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.261
11 Problem: G++ error message errornously recognized as error.
12 Solution: Ignore "In file included from" line also when it ends in a colon.
13 (Fernando Castillo)
14 Files: src/option.h
15
16
17 *** ../vim-7.3.260/src/option.h 2011-06-26 05:36:07.000000000 +0200
18 --- src/option.h 2011-07-27 13:44:08.000000000 +0200
19 ***************
20 *** 33,39 ****
21 # ifdef EBCDIC
22 #define DFLT_EFM "%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
23 # else
24 ! #define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-Gfrom %f:%l:%c,%-Gfrom %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%D%*\\a: Entering directory `%f',%X%*\\a: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
25 # endif
26 # endif
27 # endif
28 --- 33,39 ----
29 # ifdef EBCDIC
30 #define DFLT_EFM "%*[^ ] %*[^ ] %f:%l%*[ ]%m,%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
31 # else
32 ! #define DFLT_EFM "%*[^\"]\"%f\"%*\\D%l: %m,\"%f\"%*\\D%l: %m,%-G%f:%l: (Each undeclared identifier is reported only once,%-G%f:%l: for each function it appears in.),%-GIn file included from %f:%l:%c:,%-GIn file included from %f:%l:%c,%-GIn file included from %f:%l,%-Gfrom %f:%l:%c,%-Gfrom %f:%l,%f:%l:%c:%m,%f(%l):%m,%f:%l:%m,\"%f\"\\, line %l%*\\D%c%*[^ ] %m,%D%*\\a[%*\\d]: Entering directory `%f',%X%*\\a[%*\\d]: Leaving directory `%f',%D%*\\a: Entering directory `%f',%X%*\\a: Leaving directory `%f',%DMaking %*\\a in %f,%f|%l| %m"
33 # endif
34 # endif
35 # endif
36 *** ../vim-7.3.260/src/version.c 2011-07-20 18:29:33.000000000 +0200
37 --- src/version.c 2011-07-27 13:46:23.000000000 +0200
38 ***************
39 *** 711,712 ****
40 --- 711,714 ----
41 { /* Add new patch number below this line */
42 + /**/
43 + 261,
44 /**/
45
46 --
47 Have you heard about the new Barbie doll? It's called Divorce
48 Barbie. It comes with all of Ken's stuff.
49
50 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
51 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
52 \\\ an exciting new programming language -- http://www.Zimbu.org ///
53 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///