summaryrefslogtreecommitdiff
path: root/package/config/mconf.c
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-06-19 08:11:43 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-06-19 08:11:43 +0000
commit1b6f2e0f4c8445100f1ea6bea5b89db15dba0175 (patch)
tree47203e44f22361896d63103608f32c2d8ba87e13 /package/config/mconf.c
parent2c2796719afce7b7a64fa1dd0bec736b10e371da (diff)
package/config: rebase from upstream (2.6.23.14)
From Bernhards tree (2737cfdd)
Diffstat (limited to 'package/config/mconf.c')
-rw-r--r--package/config/mconf.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/package/config/mconf.c b/package/config/mconf.c
index 1073f7a29..9283ac3d7 100644
--- a/package/config/mconf.c
+++ b/package/config/mconf.c
@@ -417,11 +417,13 @@ static void search_conf(void)
{
struct symbol **sym_arr;
struct gstr res;
+ char *dialog_input;
int dres;
again:
dialog_clear();
dres = dialog_inputbox(_("Search Configuration Parameter"),
- _("Enter CONFIG_ (sub)string to search for (omit CONFIG_)"),
+ _("Enter CONFIG_ (sub)string to search for "
+ "(with or without \"CONFIG\")"),
10, 75, "");
switch (dres) {
case 0:
@@ -433,7 +435,12 @@ again:
return;
}
- sym_arr = sym_re_search(dialog_input_result);
+ /* strip CONFIG_ if necessary */
+ dialog_input = dialog_input_result;
+ if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0)
+ dialog_input += 7;
+
+ sym_arr = sym_re_search(dialog_input);
res = get_relations_str(sym_arr);
free(sym_arr);
show_textbox(_("Search Results"), str_get(&res), 0, 0);
@@ -716,11 +723,11 @@ static void show_help(struct menu *menu)
struct gstr help = str_new();
struct symbol *sym = menu->sym;
- if (sym->help)
+ if (menu_has_help(menu))
{
if (sym->name) {
str_printf(&help, "CONFIG_%s:\n\n", sym->name);
- str_append(&help, _(sym->help));
+ str_append(&help, _(menu_get_help(menu)));
str_append(&help, "\n");
}
} else {