[ipfire-3.x.git] / vim / patches / vim-7.3.538.patch0

To: vim_dev@googlegroups.com
Subject: Patch 7.3.538
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.538
Problem:    'efm' does not handle Tabs in pointer lines.
Solution:   Add Tab support. Improve tests. (Lech Lorens)
Files:	    src/quickfix.c, src/testdir/test10.in, src/testdir/test10.ok


*** ../vim-7.3.537/src/quickfix.c	2012-04-25 18:57:17.000000000 +0200
--- src/quickfix.c	2012-06-01 18:24:07.000000000 +0200
***************
*** 247,253 ****
  			{'t', "."},
  			{'m', ".\\+"},
  			{'r', ".*"},
! 			{'p', "[- .]*"},
  			{'v', "\\d\\+"},
  			{'s', ".\\+"}
  		    };
--- 247,253 ----
  			{'t', "."},
  			{'m', ".\\+"},
  			{'r', ".*"},
! 			{'p', "[- 	.]*"},
  			{'v', "\\d\\+"},
  			{'s', ".\\+"}
  		    };
***************
*** 677,687 ****
  		}
  		if ((i = (int)fmt_ptr->addr[7]) > 0)		/* %p */
  		{
  		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
  			continue;
! 		    col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
! 		    if (*((char_u *)regmatch.startp[i]) != TAB)
! 			use_viscol = TRUE;
  		}
  		if ((i = (int)fmt_ptr->addr[8]) > 0)		/* %v */
  		{
--- 677,699 ----
  		}
  		if ((i = (int)fmt_ptr->addr[7]) > 0)		/* %p */
  		{
+ 		    char_u	*match_ptr;
+ 
  		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
  			continue;
! 		    col = 0;
! 		    for (match_ptr = regmatch.startp[i];
! 				   match_ptr != regmatch.endp[i]; ++match_ptr)
! 		    {
! 			++col;
! 			if (*match_ptr == TAB)
! 			{
! 			    col += 7;
! 			    col -= col % 8;
! 			}
! 		    }
! 		    ++col;
! 		    use_viscol = TRUE;
  		}
  		if ((i = (int)fmt_ptr->addr[8]) > 0)		/* %v */
  		{
*** ../vim-7.3.537/src/testdir/test10.in	2011-08-10 18:36:49.000000000 +0200
--- src/testdir/test10.in	2012-06-01 18:22:40.000000000 +0200
***************
*** 8,48 ****
  :7/start of errorfile/,/end of errorfile/w! Xerrorfile1
  :7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
  :/start of testfile/,/end of testfile/w! Xtestfile
  :cf Xerrorfile2
  :clast
  :copen
  :let a=w:quickfix_title
  :wincmd p
! gR\12=a\r\e
  :cf Xerrorfile1
! rA
  :cn
! rB
  :cn
! rC
  :cn
! rD
  :cn
! rE
  :cn
  :wincmd w
  :let a=w:quickfix_title
  :wincmd p
! gR\12=a\r\e
  :w! test.out             " Write contents of this file
  :qa!
  ENDTEST
  
  start of errorfile
  "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
! "Xtestfile", line 7 col 19; this is an error
  gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include  version.c
! Xtestfile:13: parse error before `asd'
  make: *** [vim] Error 1
! in file "Xtestfile" linenr 16: there is an error
  
  2 returned
! "Xtestfile", linenr 19: yet another problem
  
  Does anyone know what is the problem and how to correction it?
  "Xtestfile", line 21 col 9: What is the title of the quickfix window?
--- 8,88 ----
  :7/start of errorfile/,/end of errorfile/w! Xerrorfile1
  :7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
  :/start of testfile/,/end of testfile/w! Xtestfile
+ :set efm+==%f=\\,\ line\ %l%*\\D%v%*[^\ ]\ %m
+ :set efm^=%AError\ in\ \"%f\"\ at\ line\ %l:,%Z%p^,%C%m
  :cf Xerrorfile2
  :clast
  :copen
  :let a=w:quickfix_title
  :wincmd p
! lgR\12=a\r\e
  :cf Xerrorfile1
! grA
  :cn
! gRLINE 6, COL 19\e
  :cn
! gRNO COLUMN SPECIFIED\e
  :cn
! gRAGAIN NO COLUMN\e
  :cn
! gRCOL 1\e
  :cn
+ gRCOL 2\e
+ :cn
+ gRCOL 10\e
+ :cn
+ gRVCOL 10\e
+ :cn
+ grI
+ :cn
+ gR. SPACE POINTER\e
+ :cn
+ gR. DOT POINTER\e
+ :cn
+ gR. DASH POINTER\e
+ :cn
+ gR. TAB-SPACE POINTER\e
+ :clast
+ :cprev
+ :cprev
  :wincmd w
  :let a=w:quickfix_title
  :wincmd p
! lgR\12=a\r\e
  :w! test.out             " Write contents of this file
  :qa!
  ENDTEST
  
  start of errorfile
  "Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
! "Xtestfile", line 6 col 19; this is an error
  gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include  version.c
! Xtestfile:9: parse error before `asd'
  make: *** [vim] Error 1
! in file "Xtestfile" linenr 10: there is an error
  
  2 returned
! "Xtestfile", line 11 col 1; this is an error
! "Xtestfile", line 12 col 2; this is another error
! "Xtestfile", line 14:10; this is an error in column 10
! =Xtestfile=, line 15:10; this is another error, but in vcol 10 this time
! "Xtestfile", linenr 16: yet another problem
! Error in "Xtestfile" at line 17:
! x should be a dot
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 17
!             ^
! Error in "Xtestfile" at line 18:
! x should be a dot
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 18
! .............^
! Error in "Xtestfile" at line 19:
! x should be a dot
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 19
! --------------^
! Error in "Xtestfile" at line 20:
! x should be a dot
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 20
! 	       ^
  
  Does anyone know what is the problem and how to correction it?
  "Xtestfile", line 21 col 9: What is the title of the quickfix window?
***************
*** 50,74 ****
  end of errorfile
  
  start of testfile
! line 2  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 3  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 4  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 5  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 6  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 7  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 8  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 9  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
  end of testfile
--- 90,114 ----
  end of errorfile
  
  start of testfile
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  2
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  3
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  4
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  5
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  6
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  7
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  8
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  9
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 10
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 11
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 12
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 13
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 14
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 15
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 16
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 17
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 18
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 19
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 20
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 21
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 22
  end of testfile
*** ../vim-7.3.537/src/testdir/test10.ok	2011-08-10 18:36:49.000000000 +0200
--- src/testdir/test10.ok	2012-06-01 18:22:40.000000000 +0200
***************
*** 1,23 ****
  start of testfile
! line 2  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 3  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 4  xxxAxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 5  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 6  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 7  xxxxxxxxxxBxxxxxxxxxxxxxxxxxxx
! line 8  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 9  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! Cine 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! Dine 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! Eine 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
! line 21 :cf Xerrorfile1xxxxxxxxxxxxxxx
! line 22 :cf Xerrorfile2xxxxxxxxxxxxxxx
  end of testfile
--- 1,23 ----
  start of testfile
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  2
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  3
! 	xxxxxxxxxxAxxxxxxxxxxxxxxxxxxx    line  4
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  5
! 	xxxxxxxxxxxxxxxxxLINE 6, COL 19   line  6
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  7
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  8
! 	NO COLUMN SPECIFIEDxxxxxxxxxxx    line  9
! 	AGAIN NO COLUMNxxxxxxxxxxxxxxx    line 10
! COL 1	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 11
! 	COL 2xxxxxxxxxxxxxxxxxxxxxxxxx    line 12
! 	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 13
! 	xxxxxxxxCOL 10xxxxxxxxxxxxxxxx    line 14
! 	xVCOL 10xxxxxxxxxxxxxxxxxxxxxx    line 15
! 	Ixxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 16
! 	xxxx. SPACE POINTERxxxxxxxxxxx    line 17
! 	xxxxx. DOT POINTERxxxxxxxxxxxx    line 18
! 	xxxxxx. DASH POINTERxxxxxxxxxx    line 19
! 	xxxxxxx. TAB-SPACE POINTERxxxx    line 20
! 	xxxxxxxx:cf Xerrorfile1xxxxxxx    line 21
! 	xxxxxxxx:cf Xerrorfile2xxxxxxx    line 22
  end of testfile
*** ../vim-7.3.537/src/version.c	2012-06-01 17:49:51.000000000 +0200
--- src/version.c	2012-06-01 18:22:27.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     538,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
18. Your wife drapes a blond wig over your monitor to remind you of what she
    looks like.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
Commit	Line	Data
c6060300 MT	1	To: vim_dev@googlegroups.com
	2	Subject: Patch 7.3.538
	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.538
	11	Problem: 'efm' does not handle Tabs in pointer lines.
	12	Solution: Add Tab support. Improve tests. (Lech Lorens)
	13	Files: src/quickfix.c, src/testdir/test10.in, src/testdir/test10.ok
	14
	15
	16	*** ../vim-7.3.537/src/quickfix.c 2012-04-25 18:57:17.000000000 +0200
	17	--- src/quickfix.c 2012-06-01 18:24:07.000000000 +0200
	18	***************
	19	* 247,253 **
	20	{'t', "."},
	21	{'m', ".\\+"},
	22	{'r', ".*"},
	23	! {'p', "[- .]*"},
	24	{'v', "\\d\\+"},
	25	{'s', ".\\+"}
	26	};
	27	--- 247,253 ----
	28	{'t', "."},
	29	{'m', ".\\+"},
	30	{'r', ".*"},
	31	! {'p', "[- .]*"},
	32	{'v', "\\d\\+"},
	33	{'s', ".\\+"}
	34	};
	35	***************
	36	* 677,687 **
	37	}
	38	if ((i = (int)fmt_ptr->addr[7]) > 0) /* %p */
	39	{
	40	if (regmatch.startp[i] == NULL \|\| regmatch.endp[i] == NULL)
	41	continue;
	42	! col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
	43	! if (((char_u )regmatch.startp[i]) != TAB)
	44	! use_viscol = TRUE;
	45	}
	46	if ((i = (int)fmt_ptr->addr[8]) > 0) /* %v */
	47	{
	48	--- 677,699 ----
	49	}
	50	if ((i = (int)fmt_ptr->addr[7]) > 0) /* %p */
	51	{
	52	+ char_u *match_ptr;
	53	+
	54	if (regmatch.startp[i] == NULL \|\| regmatch.endp[i] == NULL)
	55	continue;
	56	! col = 0;
	57	! for (match_ptr = regmatch.startp[i];
	58	! match_ptr != regmatch.endp[i]; ++match_ptr)
	59	! {
	60	! ++col;
	61	! if (*match_ptr == TAB)
	62	! {
	63	! col += 7;
	64	! col -= col % 8;
65	! }
66	! }
67	! ++col;
68	! use_viscol = TRUE;
69	}
70	if ((i = (int)fmt_ptr->addr[8]) > 0) /* %v */
71	{
72	*** ../vim-7.3.537/src/testdir/test10.in 2011-08-10 18:36:49.000000000 +0200
73	--- src/testdir/test10.in 2012-06-01 18:22:40.000000000 +0200
74	***************
75	* 8,48 **
76	:7/start of errorfile/,/end of errorfile/w! Xerrorfile1
77	:7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
78	:/start of testfile/,/end of testfile/w! Xtestfile
79	:cf Xerrorfile2
80	:clast
81	:copen
82	:let a=w:quickfix_title
83	:wincmd p
84	! gR\12=a\r\e
85	:cf Xerrorfile1
86	! rA
87	:cn
88	! rB
89	:cn
90	! rC
91	:cn
92	! rD
93	:cn
94	! rE
95	:cn
96	:wincmd w
97	:let a=w:quickfix_title
98	:wincmd p
99	! gR\12=a\r\e
100	:w! test.out " Write contents of this file
101	:qa!
102	ENDTEST
103
104	start of errorfile
105	"Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
106	! "Xtestfile", line 7 col 19; this is an error
107	gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c
108	! Xtestfile:13: parse error before `asd'
109	make: *** [vim] Error 1
110	! in file "Xtestfile" linenr 16: there is an error
111
112	2 returned
113	! "Xtestfile", linenr 19: yet another problem
114
115	Does anyone know what is the problem and how to correction it?
116	"Xtestfile", line 21 col 9: What is the title of the quickfix window?
117	--- 8,88 ----
118	:7/start of errorfile/,/end of errorfile/w! Xerrorfile1
119	:7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
120	:/start of testfile/,/end of testfile/w! Xtestfile
121	+ :set efm+==%f=\\,\ line\ %l%\\D%v%[^\ ]\ %m
122	+ :set efm^=%AError\ in\ \"%f\"\ at\ line\ %l:,%Z%p^,%C%m
123	:cf Xerrorfile2
124	:clast
125	:copen
126	:let a=w:quickfix_title
127	:wincmd p
128	! lgR\12=a\r\e
129	:cf Xerrorfile1
130	! grA
131	:cn
132	! gRLINE 6, COL 19\e
133	:cn
134	! gRNO COLUMN SPECIFIED\e
135	:cn
136	! gRAGAIN NO COLUMN\e
137	:cn
138	! gRCOL 1\e
139	:cn
140	+ gRCOL 2\e
141	+ :cn
142	+ gRCOL 10\e
143	+ :cn
144	+ gRVCOL 10\e
145	+ :cn
146	+ grI
147	+ :cn
148	+ gR. SPACE POINTER\e
149	+ :cn
150	+ gR. DOT POINTER\e
151	+ :cn
152	+ gR. DASH POINTER\e
153	+ :cn
154	+ gR. TAB-SPACE POINTER\e
155	+ :clast
156	+ :cprev
157	+ :cprev
158	:wincmd w
159	:let a=w:quickfix_title
160	:wincmd p
161	! lgR\12=a\r\e
162	:w! test.out " Write contents of this file
163	:qa!
164	ENDTEST
165
166	start of errorfile
167	"Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
168	! "Xtestfile", line 6 col 19; this is an error
169	gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include version.c
170	! Xtestfile:9: parse error before `asd'
171	make: *** [vim] Error 1
172	! in file "Xtestfile" linenr 10: there is an error
173
174	2 returned
175	! "Xtestfile", line 11 col 1; this is an error
176	! "Xtestfile", line 12 col 2; this is another error
177	! "Xtestfile", line 14:10; this is an error in column 10
178	! =Xtestfile=, line 15:10; this is another error, but in vcol 10 this time
179	! "Xtestfile", linenr 16: yet another problem
180	! Error in "Xtestfile" at line 17:
181	! x should be a dot
182	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
183	! ^
184	! Error in "Xtestfile" at line 18:
185	! x should be a dot
186	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
187	! .............^
188	! Error in "Xtestfile" at line 19:
189	! x should be a dot
190	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
191	! --------------^
192	! Error in "Xtestfile" at line 20:
193	! x should be a dot
194	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
195	! ^
196
197	Does anyone know what is the problem and how to correction it?
198	"Xtestfile", line 21 col 9: What is the title of the quickfix window?
199	***************
200	* 50,74 **
201	end of errorfile
202
203	start of testfile
204	! line 2 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
205	! line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
206	! line 4 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
207	! line 5 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
208	! line 6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
209	! line 7 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
210	! line 8 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
211	! line 9 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
212	! line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
213	! line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
214	! line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
215	! line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
216	! line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
217	! line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
218	! line 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
219	! line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
220	! line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
221	! line 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
222	! line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
223	! line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
224	! line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
225	end of testfile
226	--- 90,114 ----
227	end of errorfile
228
229	start of testfile
230	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2
231	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3
232	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 4
233	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5
234	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 6
235	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7
236	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8
237	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 9
238	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 10
239	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11
240	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 12
241	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13
242	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 14
243	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 15
244	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16
245	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 17
246	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 18
247	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 19
248	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 20
249	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 21
250	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 22
251	end of testfile
252	*** ../vim-7.3.537/src/testdir/test10.ok 2011-08-10 18:36:49.000000000 +0200
253	--- src/testdir/test10.ok 2012-06-01 18:22:40.000000000 +0200
254	***************
255	* 1,23 **
256	start of testfile
257	! line 2 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
258	! line 3 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
259	! line 4 xxxAxxxxxxxxxxxxxxxxxxxxxxxxxx
260	! line 5 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
261	! line 6 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
262	! line 7 xxxxxxxxxxBxxxxxxxxxxxxxxxxxxx
263	! line 8 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
264	! line 9 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
265	! line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
266	! line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
267	! line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
268	! Cine 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
269	! line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
270	! line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
271	! Dine 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
272	! line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
273	! line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
274	! Eine 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
275	! line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
276	! line 21 :cf Xerrorfile1xxxxxxxxxxxxxxx
277	! line 22 :cf Xerrorfile2xxxxxxxxxxxxxxx
278	end of testfile
279	--- 1,23 ----
280	start of testfile
281	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 2
282	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 3
283	! xxxxxxxxxxAxxxxxxxxxxxxxxxxxxx line 4
284	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 5
285	! xxxxxxxxxxxxxxxxxLINE 6, COL 19 line 6
286	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 7
287	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 8
288	! NO COLUMN SPECIFIEDxxxxxxxxxxx line 9
289	! AGAIN NO COLUMNxxxxxxxxxxxxxxx line 10
290	! COL 1 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 11
291	! COL 2xxxxxxxxxxxxxxxxxxxxxxxxx line 12
292	! xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 13
293	! xxxxxxxxCOL 10xxxxxxxxxxxxxxxx line 14
294	! xVCOL 10xxxxxxxxxxxxxxxxxxxxxx line 15
295	! Ixxxxxxxxxxxxxxxxxxxxxxxxxxxxx line 16
296	! xxxx. SPACE POINTERxxxxxxxxxxx line 17
297	! xxxxx. DOT POINTERxxxxxxxxxxxx line 18
298	! xxxxxx. DASH POINTERxxxxxxxxxx line 19
299	! xxxxxxx. TAB-SPACE POINTERxxxx line 20
300	! xxxxxxxx:cf Xerrorfile1xxxxxxx line 21
301	! xxxxxxxx:cf Xerrorfile2xxxxxxx line 22
302	end of testfile
303	*** ../vim-7.3.537/src/version.c 2012-06-01 17:49:51.000000000 +0200
304	--- src/version.c 2012-06-01 18:22:27.000000000 +0200
305	***************
306	* 716,717 **
307	--- 716,719 ----
308	{ /* Add new patch number below this line */
309	+ /**/
310	+ 538,
311	/**/
312
313	--
314	hundred-and-one symptoms of being an internet addict:
315	18. Your wife drapes a blond wig over your monitor to remind you of what she
316	looks like.
317
318	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
319	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
320	\\\ an exciting new programming language -- http://www.Zimbu.org ///
321	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///