]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.120.patch0
Merge remote-tracking branch 'stevee/dracut'
[ipfire-3.x.git] / vim / patches / vim-7.3.120.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.120
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.120
11 Problem: The message for an existing swap file is too long to fit in a 25
12 line terminal.
13 Solution: Make the message shorter. (Chad Miller)
14 Files: src/memline.c
15
16
17 *** ../vim-7.3.119/src/memline.c 2011-01-17 20:08:03.000000000 +0100
18 --- src/memline.c 2011-02-13 14:18:08.000000000 +0100
19 ***************
20 *** 4071,4079 ****
21 }
22 /* Some of these messages are long to allow translation to
23 * other languages. */
24 ! MSG_PUTS(_("\n(1) Another program may be editing the same file.\n If this is the case, be careful not to end up with two\n different instances of the same file when making changes.\n"));
25 ! MSG_PUTS(_(" Quit, or continue with caution.\n"));
26 ! MSG_PUTS(_("\n(2) An edit session for this file crashed.\n"));
27 MSG_PUTS(_(" If this is the case, use \":recover\" or \"vim -r "));
28 msg_outtrans(buf->b_fname);
29 MSG_PUTS(_("\"\n to recover the changes (see \":help recovery\").\n"));
30 --- 4071,4079 ----
31 }
32 /* Some of these messages are long to allow translation to
33 * other languages. */
34 ! MSG_PUTS(_("\n(1) Another program may be editing the same file. If this is the case,\n be careful not to end up with two different instances of the same\n file when making changes."));
35 ! MSG_PUTS(_(" Quit, or continue with caution.\n"));
36 ! MSG_PUTS(_("(2) An edit session for this file crashed.\n"));
37 MSG_PUTS(_(" If this is the case, use \":recover\" or \"vim -r "));
38 msg_outtrans(buf->b_fname);
39 MSG_PUTS(_("\"\n to recover the changes (see \":help recovery\").\n"));
40 *** ../vim-7.3.119/src/version.c 2011-02-12 13:59:55.000000000 +0100
41 --- src/version.c 2011-02-15 11:56:14.000000000 +0100
42 ***************
43 *** 716,717 ****
44 --- 716,719 ----
45 { /* Add new patch number below this line */
46 + /**/
47 + 120,
48 /**/
49
50 --
51 hundred-and-one symptoms of being an internet addict:
52 257. Your "hundred-and-one" lists include well over 101 items, since you
53 automatically interpret all numbers in hexadecimal notation.
54 (hex 101 = decimal 257)
55
56 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
57 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
58 \\\ an exciting new programming language -- http://www.Zimbu.org ///
59 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///