Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 274300
b: refs/heads/master
c: db57630
h: refs/heads/master
v: v3
  • Loading branch information
Michal Marek committed Aug 19, 2011
1 parent 839b5b8 commit aa7b576
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 50bce3e80773e06316fcb92796ff26b42348d30b
refs/heads/master: db57630b7a4f6991e6d5997fbc3cf6be55d76d23
13 changes: 5 additions & 8 deletions trunk/scripts/kconfig/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@

#include "lkc.h"

static const char nohelp_text[] = N_(
"There is no help available for this option.\n");
static const char nohelp_text[] = "There is no help available for this option.";

struct menu rootmenu;
static struct menu **last_entry_ptr;
Expand Down Expand Up @@ -595,16 +594,14 @@ struct gstr get_relations_str(struct symbol **sym_arr)
void menu_get_ext_help(struct menu *menu, struct gstr *help)
{
struct symbol *sym = menu->sym;
const char *help_text = nohelp_text;

if (menu_has_help(menu)) {
if (sym->name) {
if (sym->name)
str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
str_append(help, _(menu_get_help(menu)));
str_append(help, "\n");
}
} else {
str_append(help, nohelp_text);
help_text = menu_get_help(menu);
}
str_printf(help, "%s\n", _(help_text));
if (sym)
get_symbol_str(help, sym);
}
2 changes: 0 additions & 2 deletions trunk/scripts/kconfig/nconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ setmod_text[] = N_(
"This feature depends on another which\n"
"has been configured as a module.\n"
"As a result, this feature will be built as a module."),
nohelp_text[] = N_(
"There is no help available for this option.\n"),
load_config_text[] = N_(
"Enter the name of the configuration file you wish to load.\n"
"Accept the name shown to restore the configuration you\n"
Expand Down

0 comments on commit aa7b576

Please sign in to comment.