Merge #9552 from janlazo/vim-8.0.0411

This commit is contained in:
Justin M. Keyes
2019-01-26 16:19:02 +01:00
committed by GitHub
2 changed files with 22 additions and 2 deletions

View File

@@ -1520,7 +1520,7 @@ static char_u *menutrans_lookup(char_u *name, int len)
char_u *dname;
for (int i = 0; i < menutrans_ga.ga_len; i++) {
if (STRNCMP(name, tp[i].from, len) == 0 && tp[i].from[len] == NUL) {
if (STRNICMP(name, tp[i].from, len) == 0 && tp[i].from[len] == NUL) {
return tp[i].to;
}
}
@@ -1531,7 +1531,7 @@ static char_u *menutrans_lookup(char_u *name, int len)
dname = menu_text(name, NULL, NULL);
name[len] = c;
for (int i = 0; i < menutrans_ga.ga_len; i++) {
if (STRCMP(dname, tp[i].from_noamp) == 0) {
if (STRICMP(dname, tp[i].from_noamp) == 0) {
xfree(dname);
return tp[i].to;
}

View File

@@ -1,9 +1,29 @@
" Test that the system menu can be loaded.
if !has('menu')
finish
endif
func Test_load_menu()
try
source $VIMRUNTIME/menu.vim
catch
call assert_report('error while loading menus: ' . v:exception)
endtry
source $VIMRUNTIME/delmenu.vim
endfunc
func Test_translate_menu()
if !has('multi_lang')
return
endif
if !filereadable($VIMRUNTIME . '/lang/menu_de_de.latin1.vim')
throw 'Skipped: translated menu not found'
endif
set langmenu=de_de
source $VIMRUNTIME/menu.vim
call assert_match('browse confirm w', execute(':menu Datei.Speichern'))
source $VIMRUNTIME/delmenu.vim
endfunc