GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-24 07:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes

Browse source
This commit is contained in:
Michal Marek 2013-05-30 15:21:48 +02:00
commit 42a0940d9d
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/config
View file

@ -105,7 +105,7 @@ while [ "$1" != "" ] ; do
;; ;;
--refresh) --refresh)
;; ;;
--*-after) --*-after|-E|-D|-M)
checkarg "$1" checkarg "$1"
A=$ARG A=$ARG
checkarg "$2" checkarg "$2"

9
scripts/kconfig/lxdialog/menubox.c
View file

@ -303,10 +303,11 @@ do_resize:
} }
} }
if (i < max_choice || if (item_count() != 0 &&
key == KEY_UP || key == KEY_DOWN || (i < max_choice ||
key == '-' || key == '+' || key == KEY_UP || key == KEY_DOWN ||
key == KEY_PPAGE || key == KEY_NPAGE) { key == '-' || key == '+' ||
key == KEY_PPAGE || key == KEY_NPAGE)) {
/* Remove highligt of current item */ /* Remove highligt of current item */
print_item(scroll + choice, choice, FALSE); print_item(scroll + choice, choice, FALSE);

11
scripts/kconfig/mconf.c
View file

@ -670,11 +670,12 @@ static void conf(struct menu *menu, struct menu *active_menu)
active_menu, &s_scroll); active_menu, &s_scroll);
if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL) if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
break; break;
if (!item_activate_selected()) if (item_count() != 0) {
continue; if (!item_activate_selected())
if (!item_tag()) continue;
continue; if (!item_tag())
continue;
}
submenu = item_data(); submenu = item_data();
active_menu = item_data(); active_menu = item_data();
if (submenu) if (submenu)

15
scripts/kconfig/menu.c
View file

@ -146,11 +146,24 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
struct menu *menu = current_entry; struct menu *menu = current_entry;
while ((menu = menu->parent) != NULL) { while ((menu = menu->parent) != NULL) {
struct expr *dup_expr;
if (!menu->visibility) if (!menu->visibility)
continue; continue;
/*
* Do not add a reference to the
* menu's visibility expression but
* use a copy of it. Otherwise the
* expression reduction functions
* will modify expressions that have
* multiple references which can
* cause unwanted side effects.
*/
dup_expr = expr_copy(menu->visibility);
prop->visible.expr prop->visible.expr
= expr_alloc_and(prop->visible.expr, = expr_alloc_and(prop->visible.expr,
menu->visibility); dup_expr);
} }
} }