diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2020-09-14 23:59:48 +0900 |
---|---|---|
committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-09-20 12:58:54 +0900 |
commit | a46afd11414758233f23798cc5be51e554d04efe (patch) | |
tree | f250fb2aa038ed5bf0fe12f044fa5541230cdeff /scripts | |
parent | 19b835a5db93254a46cb90c95ddde6959d7e1e06 (diff) | |
download | linux-stable-a46afd11414758233f23798cc5be51e554d04efe.tar.gz linux-stable-a46afd11414758233f23798cc5be51e554d04efe.tar.bz2 linux-stable-a46afd11414758233f23798cc5be51e554d04efe.zip |
kconfig: qconf: revive help message in the info view
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>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/qconf.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index c7216b9110fc..8ce624a3b54b 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); } |