]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.457.patch0
vim: Import latest patches from upstream.
[ipfire-3.x.git] / vim / patches / vim-7.3.457.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.457
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.457
11 Problem: When setting $VIMRUNTIME later the directory for fetching
12 translated messages is not adjusted.
13 Solution: Put bindtextdomain() in vim_setenv().
14 Files: src/misc1.c
15
16
17 *** ../vim-7.3.456/src/misc1.c 2012-02-05 22:05:44.000000000 +0100
18 --- src/misc1.c 2012-02-26 13:27:28.000000000 +0100
19 ***************
20 *** 4133,4149 ****
21 {
22 vim_setenv((char_u *)"VIMRUNTIME", p);
23 didset_vimruntime = TRUE;
24 - #ifdef FEAT_GETTEXT
25 - {
26 - char_u *buf = concat_str(p, (char_u *)"/lang");
27 -
28 - if (buf != NULL)
29 - {
30 - bindtextdomain(VIMPACKAGE, (char *)buf);
31 - vim_free(buf);
32 - }
33 - }
34 - #endif
35 }
36 else
37 {
38 --- 4133,4138 ----
39 ***************
40 *** 4221,4226 ****
41 --- 4210,4231 ----
42 putenv((char *)envbuf);
43 }
44 #endif
45 + #ifdef FEAT_GETTEXT
46 + /*
47 + * When setting $VIMRUNTIME adjust the directory to find message
48 + * translations to $VIMRUNTIME/lang.
49 + */
50 + if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0)
51 + {
52 + char_u *buf = concat_str(val, (char_u *)"/lang");
53 +
54 + if (buf != NULL)
55 + {
56 + bindtextdomain(VIMPACKAGE, (char *)buf);
57 + vim_free(buf);
58 + }
59 + }
60 + #endif
61 }
62
63 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
64 *** ../vim-7.3.456/src/version.c 2012-02-22 19:13:00.000000000 +0100
65 --- src/version.c 2012-02-29 13:47:09.000000000 +0100
66 ***************
67 *** 716,717 ****
68 --- 716,719 ----
69 { /* Add new patch number below this line */
70 + /**/
71 + 457,
72 /**/
73
74 --
75 hundred-and-one symptoms of being an internet addict:
76 118. You are on a first-name basis with your ISP's staff.
77
78 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
79 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
80 \\\ an exciting new programming language -- http://www.Zimbu.org ///
81 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///