| Message ID | 20200914145948.515677-1-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kconfig: qconf: revive help message in the info view | expand |
On Tue, Sep 15, 2020 at 12:00 AM Masahiro Yamada <masahiroy@kernel.org> wrote: > > Since commit 68fd110b3e7e ("kconfig: qconf: remove redundant help in > the info view"), the help message is no longer displayed. > > I intended to drop duplicated "Symbol:", "Type:", but precious info > about help and reverse dependencies was lost too. > > Revive it now. > > "defined at" is contained in menu_get_ext_help(), so I made sure > to not display it twice. > > Fixes: 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view") > Reported-by: Maxim Levitsky <mlevitsk@redhat.com> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> > --- Applied to linux-kbuild/fixes. > > scripts/kconfig/qconf.cc | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc > index 8638785328a7..9f306e780c2f 100644 > --- a/scripts/kconfig/qconf.cc > +++ b/scripts/kconfig/qconf.cc > @@ -1108,6 +1108,11 @@ void ConfigInfoView::menuInfo(void) > if (showDebug()) > stream << debug_info(sym); > > + struct gstr help_gstr = str_new(); > + > + menu_get_ext_help(_menu, &help_gstr); > + stream << print_filter(str_get(&help_gstr)); > + str_free(&help_gstr); > } else if (_menu->prompt) { > stream << "<big><b>"; > stream << print_filter(_menu->prompt->text); > @@ -1119,11 +1124,11 @@ void ConfigInfoView::menuInfo(void) > expr_print_help, &stream, E_NONE); > stream << "<br><br>"; > } > + > + stream << "defined at " << _menu->file->name << ":" > + << _menu->lineno << "<br><br>"; > } > } > - if (showDebug()) > - stream << "defined at " << _menu->file->name << ":" > - << _menu->lineno << "<br><br>"; > > setText(info); > } > -- > 2.25.1 >
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 8638785328a7..9f306e780c2f 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1108,6 +1108,11 @@ void ConfigInfoView::menuInfo(void) if (showDebug()) stream << debug_info(sym); + struct gstr help_gstr = str_new(); + + menu_get_ext_help(_menu, &help_gstr); + stream << print_filter(str_get(&help_gstr)); + str_free(&help_gstr); } else if (_menu->prompt) { stream << "<big><b>"; stream << print_filter(_menu->prompt->text); @@ -1119,11 +1124,11 @@ void ConfigInfoView::menuInfo(void) expr_print_help, &stream, E_NONE); stream << "<br><br>"; } + + stream << "defined at " << _menu->file->name << ":" + << _menu->lineno << "<br><br>"; } } - if (showDebug()) - stream << "defined at " << _menu->file->name << ":" - << _menu->lineno << "<br><br>"; setText(info); }
Since commit 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view"), the help message is no longer displayed. I intended to drop duplicated "Symbol:", "Type:", but precious info about help and reverse dependencies was lost too. Revive it now. "defined at" is contained in menu_get_ext_help(), so I made sure to not display it twice. Fixes: 68fd110b3e7e ("kconfig: qconf: remove redundant help in the info view") Reported-by: Maxim Levitsky <mlevitsk@redhat.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/kconfig/qconf.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)