- Print helptexts of choices. If a choice (but not it's children) has help, print...

  If a choice's child has no help, print parents help.

diff --git a/extra/config/kconfig-to-uclibc.patch.gz b/extra/config/kconfig-to-uclibc.patch.gz
index 01c5d34f8125466b6c62ad179e7b8372cf704d36..58c41730ec7a749d3fe02fe1b136268a1253e2b9 100644 (file)
Binary files a/extra/config/kconfig-to-uclibc.patch.gz and b/extra/config/kconfig-to-uclibc.patch.gz differ

diff --git a/extra/config/mconf.c b/extra/config/mconf.c
index d7314f3a31abce5053f3214dd1e5a9132df4feae..18583bd43ea83d4ea56000c3426ca2abbac3d544 100644 (file)
--- 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);
        }