* tui.c (tui_rl_switch_mode): Renames tui_switch_mode.

	(tui_rl_change_windows): Renames tui_change_windows.
	(tui_rl_delete_other_windows): Renames tui_delete_other_windows.
	(tui_initialize_readline): Update.

diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index a29d15909e55562b7c644e9e1276dbdce131a3dd..46f29d8c16e4d81b253575484455432bff85b95b 100644 (file)
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-25  Stephane Carrez  <stcarrez@nerim.fr>
+
+       * tui.c (tui_rl_switch_mode): Renames tui_switch_mode.
+       (tui_rl_change_windows): Renames tui_change_windows.
+       (tui_rl_delete_other_windows): Renames tui_delete_other_windows.
+       (tui_initialize_readline): Update.
+
 2002-08-25  Stephane Carrez  <stcarrez@nerim.fr>
 
        * tuiDisassem.c (tuiSetDisassemContent): Use breakpoint_here_p.

diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 8bf477673d3bd44f67c938ae2515ef5fc086c791..770c3e2a7527e6d71ccc12d95c6ca19e56b6c98d 100644 (file)
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -74,7 +74,7 @@ static int tui_finish_init = 1;
 
 /* Switch the output mode between TUI/standard gdb.  */
 static int
-tui_switch_mode (void)
+tui_rl_switch_mode (void)
 {
   if (tui_active)
     {
@@ -107,15 +107,16 @@ tui_switch_mode (void)
   return 0;
 }
 
-/* Change the TUI layout to show a next layout.
+/* TUI readline command.
+   Change the TUI layout to show a next layout.
    This function is bound to CTRL-X 2.  It is intended to provide
    a functionality close to the Emacs split-window command.  We always
    show two windows (src+asm), (src+regs) or (asm+regs).  */
 static int
-tui_change_windows (void)
+tui_rl_change_windows (void)
 {
   if (!tui_active)
-    tui_switch_mode ();
+    tui_rl_switch_mode ();
 
   if (tui_active)
     {
@@ -157,13 +158,13 @@ tui_change_windows (void)
   return 0;
 }
 
-
-/* Delete the second TUI window to only show one.  */
+/* TUI readline command.
+   Delete the second TUI window to only show one.  */
 static int
-tui_delete_other_windows (void)
+tui_rl_delete_other_windows (void)
 {
   if (!tui_active)
-    tui_switch_mode ();
+    tui_rl_switch_mode ();
 
   if (tui_active)
     {
@@ -199,12 +200,12 @@ tui_initialize_readline ()
 {
   rl_initialize ();
 
-  rl_add_defun ("tui-switch-mode", tui_switch_mode, -1);
-  rl_bind_key_in_map ('a', tui_switch_mode, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('A', tui_switch_mode, emacs_ctlx_keymap);
-  rl_bind_key_in_map (CTRL ('A'), tui_switch_mode, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('1', tui_delete_other_windows, emacs_ctlx_keymap);
-  rl_bind_key_in_map ('2', tui_change_windows, emacs_ctlx_keymap);
+  rl_add_defun ("tui-switch-mode", tui_rl_switch_mode, -1);
+  rl_bind_key_in_map ('a', tui_rl_switch_mode, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('A', tui_rl_switch_mode, emacs_ctlx_keymap);
+  rl_bind_key_in_map (CTRL ('A'), tui_rl_switch_mode, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('1', tui_rl_delete_other_windows, emacs_ctlx_keymap);
+  rl_bind_key_in_map ('2', tui_rl_change_windows, emacs_ctlx_keymap);
 }
 
 /* Enter in the tui mode (curses).