|
 |
10e4dc2 |
To: vim-dev@vim.org
|
|
|
10e4dc2 |
Subject: Patch 7.2.434
|
|
|
10e4dc2 |
Fcc: outbox
|
|
|
10e4dc2 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
10e4dc2 |
Mime-Version: 1.0
|
|
|
10e4dc2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
10e4dc2 |
Content-Transfer-Encoding: 8bit
|
|
|
10e4dc2 |
------------
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
Patch 7.2.434 (after 7.2.432)
|
|
|
10e4dc2 |
Problem: Compilation fails without the multi-lang feature.
|
|
|
10e4dc2 |
Solution: Add #ifdefs. (Johm Marriott)
|
|
|
10e4dc2 |
Files: src/menu.c
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
*** ../vim-7.2.433/src/menu.c 2010-05-14 22:24:31.000000000 +0200
|
|
|
10e4dc2 |
--- src/menu.c 2010-05-16 12:28:21.000000000 +0200
|
|
|
10e4dc2 |
***************
|
|
|
10e4dc2 |
*** 1340,1346 ****
|
|
|
10e4dc2 |
--- 1340,1348 ----
|
|
|
10e4dc2 |
if (idx == 0) /* first call: start at first item */
|
|
|
10e4dc2 |
{
|
|
|
10e4dc2 |
menu = expand_menu;
|
|
|
10e4dc2 |
+ #ifdef FEAT_MULTI_LANG
|
|
|
10e4dc2 |
should_advance = FALSE;
|
|
|
10e4dc2 |
+ #endif
|
|
|
10e4dc2 |
}
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
/* Skip PopUp[nvoci]. */
|
|
|
10e4dc2 |
***************
|
|
|
10e4dc2 |
*** 1401,1407 ****
|
|
|
10e4dc2 |
--- 1403,1411 ----
|
|
|
10e4dc2 |
if (idx == 0) /* first call: start at first item */
|
|
|
10e4dc2 |
{
|
|
|
10e4dc2 |
menu = expand_menu;
|
|
|
10e4dc2 |
+ #ifdef FEAT_MULTI_LANG
|
|
|
10e4dc2 |
should_advance = FALSE;
|
|
|
10e4dc2 |
+ #endif
|
|
|
10e4dc2 |
}
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
/* Skip Browse-style entries, popup menus and separators. */
|
|
|
10e4dc2 |
***************
|
|
|
10e4dc2 |
*** 1506,1515 ****
|
|
|
10e4dc2 |
--- 1510,1521 ----
|
|
|
10e4dc2 |
char_u *name;
|
|
|
10e4dc2 |
vimmenu_T *menu;
|
|
|
10e4dc2 |
{
|
|
|
10e4dc2 |
+ #ifdef FEAT_MULTI_LANG
|
|
|
10e4dc2 |
if (menu->en_name != NULL
|
|
|
10e4dc2 |
&& (menu_namecmp(name,menu->en_name)
|
|
|
10e4dc2 |
|| menu_namecmp(name,menu->en_dname)))
|
|
|
10e4dc2 |
return TRUE;
|
|
|
10e4dc2 |
+ #endif
|
|
|
10e4dc2 |
return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
|
|
|
10e4dc2 |
}
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
*** ../vim-7.2.433/src/version.c 2010-05-14 23:14:37.000000000 +0200
|
|
|
10e4dc2 |
--- src/version.c 2010-05-16 12:29:40.000000000 +0200
|
|
|
10e4dc2 |
***************
|
|
|
10e4dc2 |
*** 683,684 ****
|
|
|
10e4dc2 |
--- 683,686 ----
|
|
|
10e4dc2 |
{ /* Add new patch number below this line */
|
|
|
10e4dc2 |
+ /**/
|
|
|
10e4dc2 |
+ 434,
|
|
|
10e4dc2 |
/**/
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
--
|
|
|
10e4dc2 |
hundred-and-one symptoms of being an internet addict:
|
|
|
10e4dc2 |
43. You tell the kids they can't use the computer because "Daddy's got work to
|
|
|
10e4dc2 |
do" and you don't even have a job.
|
|
|
10e4dc2 |
|
|
|
10e4dc2 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
10e4dc2 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
10e4dc2 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
10e4dc2 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|