]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - vim/patches/vim-7.3.247.patch0
Merge remote-tracking branch 'stevee/openvswitch-systemd'
[people/amarx/ipfire-3.x.git] / vim / patches / vim-7.3.247.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.247
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.247
11 Problem: Running tests changes the users viminfo file. Test for patch
12 7.3.246 missing.
13 Solution: Add "nviminfo" to the 'viminfo' option. Include the test.
14 Files: src/testdir/test78.in, src/testdir/test81.in
15
16
17 *** ../vim-7.3.246/src/testdir/test78.in 2011-06-13 01:07:22.000000000 +0200
18 --- src/testdir/test78.in 2011-07-15 13:26:22.000000000 +0200
19 ***************
20 *** 6,12 ****
21
22 STARTTEST
23 :so small.vim
24 ! :set nocp fileformat=unix undolevels=-1
25 :e! Xtest
26 ggdG
27 :let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
28 --- 6,12 ----
29
30 STARTTEST
31 :so small.vim
32 ! :set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo
33 :e! Xtest
34 ggdG
35 :let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
36 *** ../vim-7.3.246/src/testdir/test81.in 2011-06-26 05:36:07.000000000 +0200
37 --- src/testdir/test81.in 2011-07-15 13:25:00.000000000 +0200
38 ***************
39 *** 1,10 ****
40 Test for t movement command and 'cpo-;' setting
41
42 STARTTEST
43 ! :set nocompatible
44 :set cpo-=;
45 /firstline/
46 j0tt;D
47 $Ty;D:set cpo+=;
48 j0tt;;D
49 $Ty;;D:?firstline?+1,$w! test.out
50 --- 1,12 ----
51 Test for t movement command and 'cpo-;' setting
52
53 STARTTEST
54 ! :set nocompatible viminfo+=nviminfo
55 :set cpo-=;
56 /firstline/
57 j0tt;D
58 + 0fz;D
59 + $Fy;D
60 $Ty;D:set cpo+=;
61 j0tt;;D
62 $Ty;;D:?firstline?+1,$w! test.out
63 ***************
64 *** 13,18 ****
65 --- 15,22 ----
66
67 firstline
68 aaa two three four
69 + zzz
70 + yyy
71 bbb yee yoo four
72 ccc two three four
73 ddd yee yoo four
74 *** ../vim-7.3.246/src/version.c 2011-07-15 13:21:24.000000000 +0200
75 --- src/version.c 2011-07-15 13:31:14.000000000 +0200
76 ***************
77 *** 711,712 ****
78 --- 711,714 ----
79 { /* Add new patch number below this line */
80 + /**/
81 + 247,
82 /**/
83
84 --
85 ZOOT: I'm afraid our life must seem very dull and quiet compared to yours.
86 We are but eightscore young blondes, all between sixteen and
87 nineteen-and-a-half, cut off in this castle, with no one to protect us.
88 Oooh. It is a lonely life ... bathing ... dressing ... undressing ...
89 making exciting underwear....
90 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
91
92 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
93 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
94 \\\ an exciting new programming language -- http://www.Zimbu.org ///
95 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///