* [PATCH] nconfig: Fix help for choice menus
@ 2010-09-10 8:32 Stephen Boyd
2010-09-12 8:06 ` Nir Tzachar
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2010-09-10 8:32 UTC (permalink / raw)
To: linux-kbuild; +Cc: Michal Marek, linux-kernel, Nir Tzachar
When getting the help for a choice menu with a help section (for example
the "Choose SLAB allocator" menu) nconfig pops up a window with nothing
inside it. This is due to show_help() passing an empty string to
show_scroll_win()'s 3rd argument. The option really does have help
though, but it isn't a config symbol, so just add the help text for
the option, and don't try to add anything else like the config option
name.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Cc: Nir Tzachar <nir.tzachar@gmail.com>
---
scripts/kconfig/nconf.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 2ba71bc..19d3401 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -1252,6 +1252,8 @@ static void show_help(struct menu *menu)
str_append(&help, _(menu_get_help(menu)));
str_append(&help, "\n");
get_symbol_str(&help, menu->sym);
+ } else {
+ str_append(&help, _(menu_get_help(menu)));
}
} else {
str_append(&help, nohelp_text);
--
1.7.2.3.313.gcd15
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] nconfig: Fix help for choice menus
2010-09-10 8:32 [PATCH] nconfig: Fix help for choice menus Stephen Boyd
@ 2010-09-12 8:06 ` Nir Tzachar
2010-09-13 10:43 ` Michal Marek
0 siblings, 1 reply; 3+ messages in thread
From: Nir Tzachar @ 2010-09-12 8:06 UTC (permalink / raw)
To: Michal Marek; +Cc: linux-kbuild, linux-kernel, bebarino
On Fri, Sep 10, 2010 at 11:32 AM, Stephen Boyd <bebarino@gmail.com> wrote:
> When getting the help for a choice menu with a help section (for example
> the "Choose SLAB allocator" menu) nconfig pops up a window with nothing
> inside it. This is due to show_help() passing an empty string to
> show_scroll_win()'s 3rd argument. The option really does have help
> though, but it isn't a config symbol, so just add the help text for
> the option, and don't try to add anything else like the config option
> name.
Acked-by: Nir Tzachar <nir.tzachar@gmail.com>
> Signed-off-by: Stephen Boyd <bebarino@gmail.com>
> Cc: Nir Tzachar <nir.tzachar@gmail.com>
> ---
> scripts/kconfig/nconf.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
> index 2ba71bc..19d3401 100644
> --- a/scripts/kconfig/nconf.c
> +++ b/scripts/kconfig/nconf.c
> @@ -1252,6 +1252,8 @@ static void show_help(struct menu *menu)
> str_append(&help, _(menu_get_help(menu)));
> str_append(&help, "\n");
> get_symbol_str(&help, menu->sym);
> + } else {
> + str_append(&help, _(menu_get_help(menu)));
> }
> } else {
> str_append(&help, nohelp_text);
> --
> 1.7.2.3.313.gcd15
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] nconfig: Fix help for choice menus
2010-09-12 8:06 ` Nir Tzachar
@ 2010-09-13 10:43 ` Michal Marek
0 siblings, 0 replies; 3+ messages in thread
From: Michal Marek @ 2010-09-13 10:43 UTC (permalink / raw)
To: Nir Tzachar; +Cc: linux-kbuild, linux-kernel, bebarino
On 12.9.2010 10:06, Nir Tzachar wrote:
> On Fri, Sep 10, 2010 at 11:32 AM, Stephen Boyd <bebarino@gmail.com> wrote:
>> When getting the help for a choice menu with a help section (for example
>> the "Choose SLAB allocator" menu) nconfig pops up a window with nothing
>> inside it. This is due to show_help() passing an empty string to
>> show_scroll_win()'s 3rd argument. The option really does have help
>> though, but it isn't a config symbol, so just add the help text for
>> the option, and don't try to add anything else like the config option
>> name.
>
>
> Acked-by: Nir Tzachar <nir.tzachar@gmail.com>
Thanks, applied.
Michal
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-13 10:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-10 8:32 [PATCH] nconfig: Fix help for choice menus Stephen Boyd
2010-09-12 8:06 ` Nir Tzachar
2010-09-13 10:43 ` Michal Marek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox