summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-10-27 14:14:05 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-10-27 14:14:05 +0000
commitc44ca632330fe21bf6e88eae1b432f8b4a4b6496 (patch)
tree9a2df390805bfb2e8887ca2ebed961528662116c
parent01e6f1e63ab4b9997f51f58a228ccacd199ed162 (diff)
- Print helptexts of choices. If a choice (but not it's children) has help, print that.
If a choice's child has no help, print parents help.
-rw-r--r--extra/config/kconfig-to-uclibc.patch.gzbin5699 -> 5816 bytes
-rw-r--r--extra/config/mconf.c7
2 files changed, 5 insertions, 2 deletions
diff --git a/extra/config/kconfig-to-uclibc.patch.gz b/extra/config/kconfig-to-uclibc.patch.gz
index 01c5d34f8..58c41730e 100644
--- a/extra/config/kconfig-to-uclibc.patch.gz
+++ b/extra/config/kconfig-to-uclibc.patch.gz
Binary files differ
diff --git a/extra/config/mconf.c b/extra/config/mconf.c
index d7314f3a3..18583bd43 100644
--- a/extra/config/mconf.c
+++ b/extra/config/mconf.c
@@ -704,9 +704,12 @@ static void show_help(struct menu *menu)
{
if (sym->name) {
str_printf(&help, "%s:\n\n", sym->name);
- str_append(&help, _(menu_get_help(menu)));
- str_append(&help, "\n");
}
+ str_append(&help, _(menu_get_help(menu)));
+ str_append(&help, "\n");
+ } else if (menu_has_help(sym->prop->menu->parent)) {
+ str_append(&help, _(menu_get_help(sym->prop->menu->parent)));
+ str_append(&help, "\n");
} else {
str_append(&help, nohelp_text);
}