diff options
author | Michal Marek <mmarek@suse.cz> | 2011-01-07 14:47:49 +0000 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2011-01-07 14:47:49 +0000 |
commit | e88e113b3f354936c69769fb0ae690443200c9af (patch) | |
tree | 6d8e7c223cdedcb630d42d7092f30d616ee2976c /scripts | |
parent | 55c77dcdaaa7788826b13f2aad402c2967b795a6 (diff) | |
parent | 39177ec36236fb71257e51d0d198437b84170911 (diff) |
Merge branch 'kconfig' into for-next
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/nconf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index eda49ffc1c8c..db56377393d7 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -1266,9 +1266,13 @@ static void conf_choice(struct menu *menu) if (child->sym == sym_get_choice_value(menu->sym)) item_make(child, ':', "<X> %s", _(menu_get_prompt(child))); - else + else if (child->sym) item_make(child, ':', " %s", _(menu_get_prompt(child))); + else + item_make(child, ':', "*** %s ***", + _(menu_get_prompt(child))); + if (child->sym == active){ last_top_row = top_row(curses_menu); selected_index = i; @@ -1334,7 +1338,7 @@ static void conf_choice(struct menu *menu) break; child = item_data(); - if (!child || !menu_is_visible(child)) + if (!child || !menu_is_visible(child) || !child->sym) continue; switch (res) { case ' ': |