浏览代码

nconf: handle comment entries within choice/endchoice

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>
Peter Korsgaard 14 年之前
父节点
当前提交
39177ec362
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      scripts/kconfig/nconf.c

+ 6 - 2
scripts/kconfig/nconf.c

@@ -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 ' ':