lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nconf: handle comment entries within choice/endchoice

Browse Source 
Equivalent to af6c1598 (kconfig: handle comment entries within
choice/endchoice), but for nconfig instead.

Implement support for comment entries within choice groups. Comment entries
are displayed visually distinct from normal configs, and selecting them is
a no-op.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Peter Korsgaard
2011-01-06 16:42:45 +01:00
committed by Michal Marek
parent 0597fcd08b
commit 39177ec362
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/kconfig/nconf.c
View File

@@ -1266,9 +1266,13 @@ static void conf_choice(struct menu *menu)
if (child->sym == sym_get_choice_value(menu->sym)) if (child->sym == sym_get_choice_value(menu->sym))
item_make(child, ':', "<X> %s", item_make(child, ':', "<X> %s",
_(menu_get_prompt(child))); _(menu_get_prompt(child)));
else else if (child->sym)
item_make(child, ':', " %s", item_make(child, ':', " %s",
_(menu_get_prompt(child))); _(menu_get_prompt(child)));
else
item_make(child, ':', "*** %s ***",
_(menu_get_prompt(child)));
if (child->sym == active){ if (child->sym == active){
last_top_row = top_row(curses_menu); last_top_row = top_row(curses_menu);
selected_index = i; selected_index = i;
@@ -1334,7 +1338,7 @@ static void conf_choice(struct menu *menu)
break; break;
child = item_data(); child = item_data();
if (!child || !menu_is_visible(child)) if (!child || !menu_is_visible(child) || !child->sym)
continue; continue;
switch (res) { switch (res) {
case ' ': case ' ':