]> git.ipfire.org Git - ipfire-3.x.git/blame - vim/patches/vim-7.3.225.patch0
projects / ipfire-3.x.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
vim: Import latest patches from upstream.
[ipfire-3.x.git] / vim / patches / vim-7.3.225.patch0
CommitLineData
c6060300
MT		 1To: vim_dev@googlegroups.com
2Subject: Patch 7.3.225
3Fcc: outbox
4From: Bram Moolenaar <Bram@moolenaar.net>
5Mime-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8------------
9
10Patch 7.3.225
11Problem: Using "\n" in a substitute inside ":s" does not result in a line
12 break.
13Solution: Change behavior inside vim_regexec_nl(). Add tests. (Motoya
14 Kurotsu)
15Files: src/regexp.c, src/testdir/test79.in, src/testdir/test79.ok,
16 src/testdir/test80.in, src/testdir/test80.ok,
17 src/testdir/Makefile, src/testdir/Make_amiga.mak,
18 src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
19 src/testdir/Make_os2.mak, src/testdir/Make_vms.mms
20
21*** ../mercurial/vim73/src/regexp.c 2010-09-14 10:55:24.000000000 +0200
22--- src/regexp.c 2011-06-19 04:03:54.000000000 +0200
23***************
24*** 6872,6877 ****
25--- 6872,6878 ----
26 static regmmatch_T *submatch_mmatch;
27 static linenr_T submatch_firstlnum;
28 static linenr_T submatch_maxline;
29+ static int submatch_line_lbr;
30 #endif
31
32 #if defined(FEAT_MODIFY_FNAME) || defined(FEAT_EVAL) || defined(PROTO)
33***************
34*** 6998,7003 ****
35--- 6999,7005 ----
36 submatch_mmatch = reg_mmatch;
37 submatch_firstlnum = reg_firstlnum;
38 submatch_maxline = reg_maxline;
39+ submatch_line_lbr = reg_line_lbr;
40 save_reg_win = reg_win;
41 save_ireg_ic = ireg_ic;
42 can_f_submatch = TRUE;
43***************
44*** 7009,7017 ****
45
46 for (s = eval_result; *s != NUL; mb_ptr_adv(s))
47 {
48! /* Change NL to CR, so that it becomes a line break.
49 * Skip over a backslashed character. */
50! if (*s == NL)
51 *s = CAR;
52 else if (*s == '\\' && s[1] != NUL)
53 {
54--- 7011,7020 ----
55
56 for (s = eval_result; *s != NUL; mb_ptr_adv(s))
57 {
58! /* Change NL to CR, so that it becomes a line break,
59! * unless called from vim_regexec_nl().
60 * Skip over a backslashed character. */
61! if (*s == NL && !submatch_line_lbr)
62 *s = CAR;
63 else if (*s == '\\' && s[1] != NUL)
64 {
65***************
66*** 7020,7027 ****
67 * :s/abc\\\ndef/\="aaa\\\nbbb"/ on text:
68 * abc\
69 * def
70 */
71! if (*s == NL)
72 *s = CAR;
73 had_backslash = TRUE;
74 }
75--- 7023,7031 ----
76 * :s/abc\\\ndef/\="aaa\\\nbbb"/ on text:
77 * abc\
78 * def
79+ * Not when called from vim_regexec_nl().
80 */
81! if (*s == NL && !submatch_line_lbr)
82 *s = CAR;
83 had_backslash = TRUE;
84 }
85***************
86*** 7044,7049 ****
87--- 7048,7054 ----
88 reg_mmatch = submatch_mmatch;
89 reg_firstlnum = submatch_firstlnum;
90 reg_maxline = submatch_maxline;
91+ reg_line_lbr = submatch_line_lbr;
92 reg_win = save_reg_win;
93 ireg_ic = save_ireg_ic;
94 can_f_submatch = FALSE;
95*** ../mercurial/vim73/src/testdir/test79.in 2011-06-19 04:30:54.000000000 +0200
96--- src/testdir/test79.in 2011-06-19 03:45:26.000000000 +0200
97***************
98*** 0 ****
99--- 1,213 ----
100+ Test for *sub-replace-special* and *sub-replace-expression* on :substitute.
101+ Test for submatch() on :substitue.
102+ Test for *:s%* on :substitute.
103+
104+ STARTTEST
105+ :so small.vim
106+ ENDTEST
107+
108+ Results of test71:
109+
110+ STARTTEST
111+ :set magic
112+ :set cpo&
113+ /^TEST/
114+ j:s/A/&&/
115+ j:s/B/\&/
116+ j:s/C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\0\9\8\7\6\5\4\3\2\1/
117+ j:s/D/d/
118+ j:s/E/~/
119+ j:s/F/\~/
120+ j:s/G/\ugg/
121+ j:s/H/\Uh\Eh/
122+ j:s/I/\lII/
123+ j:s/J/\LJ\EJ/
124+ j:s/K/\Uk\ek/
125+ j:s/L/\16\r/
126+ j:s/M/\r/
127+ j:s/N/\\16\r/
128+ j:s/O/\n/
129+ j:s/P/\b/
130+ j:s/Q/\t/
131+ j:s/R/\\/
132+ j:s/S/\c/
133+ j:s/T/\16\0/
134+ ENDTEST
135+
136+ TEST_1:
137+ A
138+ B
139+ C123456789
140+ D
141+ E
142+ F
143+ G
144+ H
145+ I
146+ J
147+ K
148+ lLl
149+ mMm
150+ nNn
151+ oOo
152+ pPp
153+ qQq
154+ rRr
155+ sSs
156+ tTt
157+
158+ STARTTEST
159+ :set nomagic
160+ :set cpo&
161+ /^TEST/
162+ j:s/A/&&/
163+ j:s/B/\&/
164+ j:s/\mC\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\0\9\8\7\6\5\4\3\2\1/
165+ j:s/D/d/
166+ j:s/E/~/
167+ j:s/F/\~/
168+ j:s/G/\ugg/
169+ j:s/H/\Uh\Eh/
170+ j:s/I/\lII/
171+ j:s/J/\LJ\EJ/
172+ j:s/K/\Uk\ek/
173+ j:s/L/\16\r/
174+ j:s/M/\r/
175+ j:s/N/\\16\r/
176+ j:s/O/\n/
177+ j:s/P/\b/
178+ j:s/Q/\t/
179+ j:s/R/\\/
180+ j:s/S/\c/
181+ j:s/T/\16\0/
182+ ENDTEST
183+
184+ TEST_2:
185+ A
186+ B
187+ C123456789
188+ D
189+ E
190+ F
191+ G
192+ H
193+ I
194+ J
195+ K
196+ lLl
197+ mMm
198+ nNn
199+ oOo
200+ pPp
201+ qQq
202+ rRr
203+ sSs
204+ tTt
205+
206+ STARTTEST
207+ :set magic&
208+ :set cpo&
209+ /^TEST/
210+ j:s/A/\='\'/
211+ j:s/B/\='\\'/
212+ j:s/C/\='\16\r'/
213+ j:s/D/\='\\16\r'/
214+ j:s/E/\='\\\16\r'/
215+ j:s/F/\='\r'/
216+ j:s/G/\='\16\0'/
217+ j:s/H/\='\\16\0'/
218+ j:s/I/\='\\\16\0'/
219+ j:s/J/\='\n'/
220+ j:s/K/\="\r"/
221+ j:s/L/\="\n"/
222+ ENDTEST
223+
224+ TEST_3:
225+ aAa
226+ bBb
227+ cCc
228+ dDd
229+ eEe
230+ fFf
231+ gGg
232+ hHh
233+ iIi
234+ jJj
235+ kKk
236+ lLl
237+
238+ STARTTEST
239+ :set magic&
240+ :set cpo&
241+ /^TEST/
242+ j:s/A/\=substitute(submatch(0), '.', '\', '')/
243+ j:s/B/\=substitute(submatch(0), '.', '\\', '')/
244+ j:s/C/\=substitute(submatch(0), '.', '\16\r', '')/
245+ j:s/D/\=substitute(submatch(0), '.', '\\16\r', '')/
246+ j:s/E/\=substitute(submatch(0), '.', '\\\16\r', '')/
247+ j:s/F/\=substitute(submatch(0), '.', '\r', '')/
248+ j:s/G/\=substitute(submatch(0), '.', '\16\0', '')/
249+ j:s/H/\=substitute(submatch(0), '.', '\\16\0', '')/
250+ j:s/I/\=substitute(submatch(0), '.', '\\\16\0', '')/
251+ j:s/J/\=substitute(submatch(0), '.', '\n', '')/
252+ j:s/K/\=substitute(submatch(0), '.', "\r", '')/
253+ j:s/L/\=substitute(submatch(0), '.', "\n", '')/
254+ ENDTEST
255+
256+ TEST_4:
257+ aAa
258+ bBb
259+ cCc
260+ dDd
261+ eEe
262+ fFf
263+ gGg
264+ hHh
265+ iIi
266+ jJj
267+ kKk
268+ lLl
269+
270+ STARTTEST
271+ :set magic&
272+ :set cpo&
273+ /^TEST/
274+ j:s/A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . submatch(6) . submatch(5) . submatch(4) . submatch(3) . submatch(2) . submatch(1)/
275+ ENDTEST
276+
277+ TEST_5:
278+ A123456789
279+
280+ STARTTEST
281+ :set magic&
282+ /^TEST/
283+ :set cpo+=/
284+ j:s/A/a/
285+ j:s/B/%/
286+ :set cpo-=/
287+ j:s/C/c/
288+ j:s/D/%/
289+ ENDTEST
290+
291+ TEST_6:
292+ A
293+ B
294+ C
295+ D
296+
297+ STARTTEST
298+ :set magic&
299+ :set cpo&
300+ /^TEST/
301+ j:s/A./\=submatch(0)/
302+ j:s/B./\=submatch(0)/
303+ ENDTEST
304+
305+ TEST_7:
306+ A\rA
307+ B\0B
308+
309+ STARTTEST
310+ :g/^STARTTEST/.,/^ENDTEST/d
311+ :1;/^Results/,$wq! test.out
312+ ENDTEST
313*** ../mercurial/vim73/src/testdir/test79.ok 2011-06-19 04:30:54.000000000 +0200
314--- src/testdir/test79.ok 2011-06-19 03:45:26.000000000 +0200
315***************
316*** 0 ****
317--- 1,118 ----
318+ Results of test71:
319+
320+
321+ TEST_1:
322+ AA
323+ &
324+ C123456789987654321
325+ d
326+ d
327+ ~
328+ Gg
329+ Hh
330+ iI
331+ jJ
332+ Kk
333+ l
334+ l
335+ m
336+ m
337+ n\rn
338+ o\0o
339+ p\bp
340+ q q
341+ r\r
342+ scs
343+ t\0t
344+
345+
346+ TEST_2:
347+ &&
348+ B
349+ C123456789987654321
350+ d
351+ ~
352+ ~
353+ Gg
354+ Hh
355+ iI
356+ jJ
357+ Kk
358+ l
359+ l
360+ m
361+ m
362+ n\rn
363+ o\0o
364+ p\bp
365+ q q
366+ r\r
367+ scs
368+ t\0t
369+
370+
371+ TEST_3:
372+ a\a
373+ b\\b
374+ c
375+ c
376+ d\
377+ d
378+ e\\
379+ e
380+ f\rf
381+ g
382+ g
383+ h\
384+ h
385+ i\\
386+ i
387+ j\nj
388+ k
389+ k
390+ l
391+ l
392+
393+
394+ TEST_4:
395+ a\a
396+ b\b
397+ c
398+ c
399+ d
400+ d
401+ e\
402+ e
403+ f
404+ f
405+ g
406+ g
407+ h
408+ h
409+ i\
410+ i
411+ j
412+ j
413+ k
414+ k
415+ l
416+ l
417+
418+
419+ TEST_5:
420+ A123456789987654321
421+
422+
423+ TEST_6:
424+ a
425+ a
426+ c
427+ %
428+
429+
430+ TEST_7:
431+ A
432+ A
433+ B
434+ B
435+
436*** ../mercurial/vim73/src/testdir/test80.in 2011-06-19 04:30:54.000000000 +0200
437--- src/testdir/test80.in 2011-06-19 03:45:26.000000000 +0200
438***************
439*** 0 ****
440--- 1,150 ----
441+ Test for *sub-replace-special* and *sub-replace-expression* on substitue().
442+ Test for submatch() on substitue().
443+ Test for *:s%* on :substitute.
444+
445+ STARTTEST
446+ :so small.vim
447+ ENDTEST
448+
449+ TEST_1:
450+
451+ STARTTEST
452+ :set magic
453+ :set cpo&
454+ :$put =\"\n\nTEST_1:\"
455+ :$put =substitute('A', 'A', '&&', '')
456+ :$put =substitute('B', 'B', '\&', '')
457+ :$put =substitute('C123456789', 'C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\0\9\8\7\6\5\4\3\2\1', '')
458+ :$put =substitute('D', 'D', 'd', '')
459+ :$put =substitute('E', 'E', '~', '')
460+ :$put =substitute('F', 'F', '\~', '')
461+ :$put =substitute('G', 'G', '\ugg', '')
462+ :$put =substitute('H', 'H', '\Uh\Eh', '')
463+ :$put =substitute('I', 'I', '\lII', '')
464+ :$put =substitute('J', 'J', '\LJ\EJ', '')
465+ :$put =substitute('K', 'K', '\Uk\ek', '')
466+ :$put =substitute('lLl', 'L', '\16\r', '')
467+ :$put =substitute('mMm', 'M', '\r', '')
468+ :$put =substitute('nNn', 'N', '\\16\r', '')
469+ :$put =substitute('oOo', 'O', '\n', '')
470+ :$put =substitute('pPp', 'P', '\b', '')
471+ :$put =substitute('qQq', 'Q', '\t', '')
472+ :$put =substitute('rRr', 'R', '\\', '')
473+ :$put =substitute('sSs', 'S', '\c', '')
474+ :$put =substitute('uUu', 'U', \"\n\", '')
475+ :$put =substitute('vVv', 'V', \"\b\", '')
476+ :$put =substitute('wWw', 'W', \"\\\", '')
477+ :$put =substitute('xXx', 'X', \"\r\", '')
478+ /^TEST_2
479+ ENDTEST
480+
481+ TEST_2:
482+
483+ STARTTEST
484+ :set nomagic
485+ :set cpo&
486+ :$put =\"\n\nTEST_2:\"
487+ :$put =substitute('A', 'A', '&&', '')
488+ :$put =substitute('B', 'B', '\&', '')
489+ :$put =substitute('C123456789', 'C\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\0\9\8\7\6\5\4\3\2\1', '')
490+ :$put =substitute('D', 'D', 'd', '')
491+ :$put =substitute('E', 'E', '~', '')
492+ :$put =substitute('F', 'F', '\~', '')
493+ :$put =substitute('G', 'G', '\ugg', '')
494+ :$put =substitute('H', 'H', '\Uh\Eh', '')
495+ :$put =substitute('I', 'I', '\lII', '')
496+ :$put =substitute('J', 'J', '\LJ\EJ', '')
497+ :$put =substitute('K', 'K', '\Uk\ek', '')
498+ :$put =substitute('lLl', 'L', '\16\r', '')
499+ :$put =substitute('mMm', 'M', '\r', '')
500+ :$put =substitute('nNn', 'N', '\\16\r', '')
501+ :$put =substitute('oOo', 'O', '\n', '')
502+ :$put =substitute('pPp', 'P', '\b', '')
503+ :$put =substitute('qQq', 'Q', '\t', '')
504+ :$put =substitute('rRr', 'R', '\\', '')
505+ :$put =substitute('sSs', 'S', '\c', '')
506+ :$put =substitute('tTt', 'T', \"\r\", '')
507+ :$put =substitute('uUu', 'U', \"\n\", '')
508+ :$put =substitute('vVv', 'V', \"\b\", '')
509+ :$put =substitute('wWw', 'W', \"\\\", '')
510+ /^TEST_3
511+ ENDTEST
512+
513+ TEST_3:
514+
515+ STARTTEST
516+ :set magic&
517+ :set cpo&
518+ :$put =\"\n\nTEST_3:\"
519+ :let y = substitute('aAa', 'A', '\="\\"', '') | $put =y
520+ :let y = substitute('bBb', 'B', '\="\\\\"', '') | $put =y
521+ :let y = substitute('cCc', 'C', '\="\16\r"', '') | $put =y
522+ :let y = substitute('dDd', 'D', '\="\\\16\r"', '') | $put =y
523+ :let y = substitute('eEe', 'E', '\="\\\\\16\r"', '') | $put =y
524+ :let y = substitute('fFf', 'F', '\="\\r"', '') | $put =y
525+ :let y = substitute('jJj', 'J', '\="\\n"', '') | $put =y
526+ :let y = substitute('kKk', 'K', '\="\r"', '') | $put =y
527+ :let y = substitute('lLl', 'L', '\="\n"', '') | $put =y
528+ /^TEST_4
529+ ENDTEST
530+
531+ TEST_4:
532+
533+ STARTTEST
534+ :set magic&
535+ :set cpo&
536+ :$put =\"\n\nTEST_4:\"
537+ :let y = substitute('aAa', 'A', '\=substitute(submatch(0), ".", "\\", "")', '') | $put =y
538+ :let y = substitute('bBb', 'B', '\=substitute(submatch(0), ".", "\\\\", "")', '') | $put =y
539+ :let y = substitute('cCc', 'C', '\=substitute(submatch(0), ".", "\16\r", "")', '') | $put =y
540+ :let y = substitute('dDd', 'D', '\=substitute(submatch(0), ".", "\\\16\r", "")', '') | $put =y
541+ :let y = substitute('eEe', 'E', '\=substitute(submatch(0), ".", "\\\\\16\r", "")', '') | $put =y
542+ :let y = substitute('fFf', 'F', '\=substitute(submatch(0), ".", "\\r", "")', '') | $put =y
543+ :let y = substitute('jJj', 'J', '\=substitute(submatch(0), ".", "\\n", "")', '') | $put =y
544+ :let y = substitute('kKk', 'K', '\=substitute(submatch(0), ".", "\r", "")', '') | $put =y
545+ :let y = substitute('lLl', 'L', '\=substitute(submatch(0), ".", "\n", "")', '') | $put =y
546+ /^TEST_5
547+ ENDTEST
548+
549+ TEST_5:
550+
551+ STARTTEST
552+ :set magic&
553+ :set cpo&
554+ :$put =\"\n\nTEST_5:\"
555+ :$put =substitute('A123456789', 'A\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)', '\=submatch(0) . submatch(9) . submatch(8) . submatch(7) . submatch(6) . submatch(5) . submatch(4) . submatch(3) . submatch(2) . submatch(1)', '')
556+ /^TEST_6
557+ ENDTEST
558+
559+ TEST_6:
560+
561+ STARTTEST
562+ :set magic&
563+ :$put =\"\n\nTEST_6:\"
564+ :set cpo+=/
565+ :$put =substitute('A', 'A', 'a', '')
566+ :$put =substitute('B', 'B', '%', '')
567+ :set cpo-=/
568+ :$put =substitute('C', 'C', 'c', '')
569+ :$put =substitute('D', 'D', '%', '')
570+ /^TEST_7
571+ ENDTEST
572+
573+ TEST_7:
574+
575+ STARTTEST
576+ :set magic&
577+ :set cpo&
578+ :$put =\"\n\nTEST_7:\"
579+ :$put =substitute('A\16\rA', 'A.', '\=submatch(0)', '')
580+ :$put =substitute(\"B\nB\", 'B.', '\=submatch(0)', '')
581+ /^TEST_8
582+ ENDTEST
583+
584+ TEST_8:
585+
586+ STARTTEST
587+ :/^Results/,$wq! test.out
588+ ENDTEST
589+
590+ Results of test72:
591*** ../mercurial/vim73/src/testdir/test80.ok 2011-06-19 04:30:54.000000000 +0200
592--- src/testdir/test80.ok 2011-06-19 03:45:26.000000000 +0200
593***************
594*** 0 ****
595--- 1,101 ----
596+ Results of test72:
597+
598+
599+ TEST_1:
600+ AA
601+ &
602+ C123456789987654321
603+ d
604+ ~
605+ ~
606+ Gg
607+ Hh
608+ iI
609+ jJ
610+ Kk
611+ l\rl
612+ m\rm
613+ n\rn
614+ o
615+ o
616+ p\bp
617+ q q
618+ r\r
619+ scs
620+ u
621+ u
622+ v\bv
623+ w\w
624+ x\rx
625+
626+
627+ TEST_2:
628+ AA
629+ &
630+ C123456789987654321
631+ d
632+ ~
633+ ~
634+ Gg
635+ Hh
636+ iI
637+ jJ
638+ Kk
639+ l\rl
640+ m\rm
641+ n\rn
642+ o
643+ o
644+ p\bp
645+ q q
646+ r\r
647+ scs
648+ t\rt
649+ u
650+ u
651+ v\bv
652+ w\w
653+
654+
655+ TEST_3:
656+ a\a
657+ b\\b
658+ c\rc
659+ d\\rd
660+ e\\\re
661+ f\rf
662+ j\nj
663+ k\rk
664+ l
665+ l
666+
667+
668+ TEST_4:
669+ a\a
670+ b\b
671+ c\rc
672+ d\rd
673+ e\\re
674+ f\rf
675+ j
676+ j
677+ k\rk
678+ l
679+ l
680+
681+
682+ TEST_5:
683+ A123456789987654321
684+
685+
686+ TEST_6:
687+ a
688+ %
689+ c
690+ %
691+
692+
693+ TEST_7:
694+ A\rA
695+ B
696+ B
697*** ../mercurial/vim73/src/testdir/Makefile 2011-06-13 01:07:22.000000000 +0200
698--- src/testdir/Makefile 2011-06-19 03:53:36.000000000 +0200
699***************
700*** 25,31 ****
701 test59.out test60.out test61.out test62.out test63.out \
702 test64.out test65.out test66.out test67.out test68.out \
703 test69.out test70.out test71.out test72.out test73.out \
704! test74.out test75.out test76.out test77.out test78.out
705
706 SCRIPTS_GUI = test16.out
707
708--- 25,32 ----
709 test59.out test60.out test61.out test62.out test63.out \
710 test64.out test65.out test66.out test67.out test68.out \
711 test69.out test70.out test71.out test72.out test73.out \
712! test74.out test75.out test76.out test77.out test78.out \
713! test79.out test80.out
714
715 SCRIPTS_GUI = test16.out
716
717*** ../mercurial/vim73/src/testdir/Make_amiga.mak 2011-06-13 01:07:22.000000000 +0200
718--- src/testdir/Make_amiga.mak 2011-06-19 03:52:32.000000000 +0200
719***************
720*** 28,34 ****
721 test61.out test62.out test63.out test64.out test65.out \
722 test66.out test67.out test68.out test69.out test70.out \
723 test71.out test72.out test73.out test74.out test75.out \
724! test76.out test77.out test78.out
725
726 .SUFFIXES: .in .out
727
728--- 28,34 ----
729 test61.out test62.out test63.out test64.out test65.out \
730 test66.out test67.out test68.out test69.out test70.out \
731 test71.out test72.out test73.out test74.out test75.out \
732! test76.out test77.out test78.out test79.out test80.out
733
734 .SUFFIXES: .in .out
735
736***************
737*** 126,128 ****
738--- 126,130 ----
739 test76.out: test76.in
740 test77.out: test77.in
741 test78.out: test78.in
742+ test79.out: test79.in
743+ test80.out: test80.in
744*** ../mercurial/vim73/src/testdir/Make_dos.mak 2011-06-13 01:07:22.000000000 +0200
745--- src/testdir/Make_dos.mak 2011-06-19 03:52:43.000000000 +0200
746***************
747*** 28,34 ****
748 test37.out test38.out test39.out test40.out test41.out \
749 test42.out test52.out test65.out test66.out test67.out \
750 test68.out test69.out test71.out test72.out test73.out \
751! test74.out test75.out test76.out test77.out test78.out
752
753 SCRIPTS32 = test50.out test70.out
754
755--- 28,35 ----
756 test37.out test38.out test39.out test40.out test41.out \
757 test42.out test52.out test65.out test66.out test67.out \
758 test68.out test69.out test71.out test72.out test73.out \
759! test74.out test75.out test76.out test77.out test78.out \
760! test79.out test80.out
761
762 SCRIPTS32 = test50.out test70.out
763
764*** ../mercurial/vim73/src/testdir/Make_ming.mak 2011-06-13 01:07:22.000000000 +0200
765--- src/testdir/Make_ming.mak 2011-06-19 03:52:58.000000000 +0200
766***************
767*** 48,54 ****
768 test37.out test38.out test39.out test40.out test41.out \
769 test42.out test52.out test65.out test66.out test67.out \
770 test68.out test69.out test71.out test72.out test73.out \
771! test74.out test75.out test76.out test77.out test78.out
772
773 SCRIPTS32 = test50.out test70.out
774
775--- 48,55 ----
776 test37.out test38.out test39.out test40.out test41.out \
777 test42.out test52.out test65.out test66.out test67.out \
778 test68.out test69.out test71.out test72.out test73.out \
779! test74.out test75.out test76.out test77.out test78.out \
780! test79.out test80.out
781
782 SCRIPTS32 = test50.out test70.out
783
784*** ../mercurial/vim73/src/testdir/Make_os2.mak 2011-06-13 01:07:22.000000000 +0200
785--- src/testdir/Make_os2.mak 2011-06-19 03:53:09.000000000 +0200
786***************
787*** 28,34 ****
788 test61.out test62.out test63.out test64.out test65.out \
789 test66.out test67.out test68.out test69.out test70.out \
790 test71.out test72.out test73.out test74.out test75.out \
791! test76.out test77.out test78.out
792
793 .SUFFIXES: .in .out
794
795--- 28,34 ----
796 test61.out test62.out test63.out test64.out test65.out \
797 test66.out test67.out test68.out test69.out test70.out \
798 test71.out test72.out test73.out test74.out test75.out \
799! test76.out test77.out test78.out test79.out test80.out
800
801 .SUFFIXES: .in .out
802
803*** ../mercurial/vim73/src/testdir/Make_vms.mms 2011-06-13 01:07:22.000000000 +0200
804--- src/testdir/Make_vms.mms 2011-06-19 03:53:18.000000000 +0200
805***************
806*** 4,10 ****
807 # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
808 # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
809 #
810! # Last change: 2011 Jun 13
811 #
812 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
813 # Edit the lines in the Configuration section below to select.
814--- 4,10 ----
815 # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
816 # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
817 #
818! # Last change: 2011 Jun 19
819 #
820 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
821 # Edit the lines in the Configuration section below to select.
822***************
823*** 75,81 ****
824 test61.out test62.out test63.out test64.out test65.out \
825 test66.out test67.out test68.out test69.out \
826 test71.out test72.out test74.out test75.out test76.out \
827! test77.out test78.out
828
829 # Known problems:
830 # Test 30: a problem around mac format - unknown reason
831--- 75,81 ----
832 test61.out test62.out test63.out test64.out test65.out \
833 test66.out test67.out test68.out test69.out \
834 test71.out test72.out test74.out test75.out test76.out \
835! test77.out test78.out test79.out test80.out
836
837 # Known problems:
838 # Test 30: a problem around mac format - unknown reason
839*** ../vim-7.3.224/src/version.c 2011-06-19 02:55:32.000000000 +0200
840--- src/version.c 2011-06-19 04:27:54.000000000 +0200
841***************
842*** 711,712 ****
843--- 711,714 ----
844 { /* Add new patch number below this line */
845+ /**/
846+ 225,
847 /**/
848
849--
850hundred-and-one symptoms of being an internet addict:
851194. Your business cards contain your e-mail and home page address.
852
853 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
854/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
855\\\ an exciting new programming language -- http://www.Zimbu.org ///
856 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
IPFire 3.x development tree