]> git.ipfire.org Git - ipfire-3.x.git/blob - vim/patches/vim-7.3.095.patch0
Merge remote-tracking branch 'stevee/dracut'
[ipfire-3.x.git] / vim / patches / vim-7.3.095.patch0
1 To: vim_dev@googlegroups.com
2 Subject: Patch 7.3.095
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.095
11 Problem: Win32: In Chinese tear-off menu doesn't work. (Weasley)
12 Solution: Use menu_name_equal(). (Alex Jakushev)
13 Files: src/menu.c
14
15
16 *** ../vim-7.3.094/src/menu.c 2010-08-15 21:57:25.000000000 +0200
17 --- src/menu.c 2011-01-04 17:41:38.000000000 +0100
18 ***************
19 *** 1512,1519 ****
20 {
21 #ifdef FEAT_MULTI_LANG
22 if (menu->en_name != NULL
23 ! && (menu_namecmp(name,menu->en_name)
24 ! || menu_namecmp(name,menu->en_dname)))
25 return TRUE;
26 #endif
27 return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
28 --- 1512,1519 ----
29 {
30 #ifdef FEAT_MULTI_LANG
31 if (menu->en_name != NULL
32 ! && (menu_namecmp(name, menu->en_name)
33 ! || menu_namecmp(name, menu->en_dname)))
34 return TRUE;
35 #endif
36 return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
37 ***************
38 *** 2342,2348 ****
39
40 while (menu != NULL)
41 {
42 ! if (STRCMP(name, menu->name) == 0 || STRCMP(name, menu->dname) == 0)
43 {
44 if (menu->children == NULL)
45 {
46 --- 2342,2348 ----
47
48 while (menu != NULL)
49 {
50 ! if (menu_name_equal(name, menu))
51 {
52 if (menu->children == NULL)
53 {
54 *** ../vim-7.3.094/src/version.c 2010-12-30 14:57:03.000000000 +0100
55 --- src/version.c 2011-01-04 17:43:41.000000000 +0100
56 ***************
57 *** 716,717 ****
58 --- 716,719 ----
59 { /* Add new patch number below this line */
60 + /**/
61 + 95,
62 /**/
63
64 --
65 If your nose runs, and your feet smell, you might be upside down.
66
67 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
68 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
69 \\\ an exciting new programming language -- http://www.Zimbu.org ///
70 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///