[binutils-gdb] [gdb/tui] Replace macro HELP_ATTRIBUTE_MODE with std::string
Tom de Vries
vries@sourceware.org
Mon Jun 12 06:25:18 GMT 2023
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=45601fb84d4705211b0477dd1bab2e73d39dc27c
commit 45601fb84d4705211b0477dd1bab2e73d39dc27c
Author: Tom de Vries <tdevries@suse.de>
Date: Mon Jun 12 08:25:31 2023 +0200
[gdb/tui] Replace macro HELP_ATTRIBUTE_MODE with std::string
Replace macro HELP_ATTRIBUTE_MODE with a std::string.
Tested on x86_64-linux.
Reviewed-By: Bruno Larsen <blarsen@redhat.com>
Reviewed-By: Tom Tromey <tom@tromey.com>
Diff:
---
gdb/tui/tui-win.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 71f961e04d2..7bceebb4525 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -1220,39 +1220,43 @@ This variable controls the border of TUI windows:\n\
show_tui_border_kind,
&tui_setlist, &tui_showlist);
-#define HELP_ATTRIBUTE_MODE "\
+ const std::string help_attribute_mode (_("\
normal normal display\n\
standout use highlight mode of terminal\n\
reverse use reverse video mode\n\
half use half bright\n\
half-standout use half bright and standout mode\n\
bold use extra bright or bold\n\
- bold-standout use extra bright or bold with standout mode"
+ bold-standout use extra bright or bold with standout mode"));
+
+ const std::string help_tui_border_mode
+ = (_("\
+This variable controls the attributes to use for the window borders:\n")
+ + help_attribute_mode);
add_setshow_enum_cmd ("border-mode", no_class, tui_border_mode_enums,
&tui_border_mode, _("\
Set the attribute mode to use for the TUI window borders."), _("\
Show the attribute mode to use for the TUI window borders."),
- _("\
-This variable controls the attributes to use for the window borders:\n"
- HELP_ATTRIBUTE_MODE),
+ help_tui_border_mode.c_str (),
tui_set_var_cmd,
show_tui_border_mode,
&tui_setlist, &tui_showlist);
+ const std::string help_tui_active_border_mode
+ = (_("\
+This variable controls the attributes to use for the active window borders:\n")
+ + help_attribute_mode);
+
add_setshow_enum_cmd ("active-border-mode", no_class, tui_border_mode_enums,
&tui_active_border_mode, _("\
Set the attribute mode to use for the active TUI window border."), _("\
Show the attribute mode to use for the active TUI window border."),
- _("\
-This variable controls the attributes to use for the active window border:\n"
- HELP_ATTRIBUTE_MODE),
+ help_tui_active_border_mode.c_str (),
tui_set_var_cmd,
show_tui_active_border_mode,
&tui_setlist, &tui_showlist);
-#undef HELP_ATTRIBUTE_MODE
-
add_setshow_zuinteger_cmd ("tab-width", no_class,
&internal_tab_width, _("\
Set the tab width, in characters, for the TUI."), _("\
More information about the Gdb-cvs
mailing list