Regularize spelling of names of keys

This changes gdb to use <KEY> when referring to the name of a key that
the user should press -- basically for return and tab.

In one spot, an obsolete use of <return> is removed.

Reviewed-By: Eli Zaretskii <eliz@gnu.org>
Approved-by: Kevin Buettner <kevinb@redhat.com>

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 6fa5a61ae02583ac91ca2572f79055e82f9c5d28..5cf8f87cd752a417527884630ea548f300379a11 100644 (file)
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -2674,8 +2674,8 @@ Here are some common GDB behaviors that you can expect, which are\n\
 not tied to any specific command but rather GDB functionality itself:\n\
 \n\
 EXPR is any arbitrary expression valid for the current programming language.\n\
-Pressing <return> with an empty prompt executes the last command again.\n\
-You can use <tab> to complete commands and symbols.  Pressing it twice lists\n\
+Pressing <RET> with an empty prompt executes the last command again.\n\
+You can use <TAB> to complete commands and symbols.  Pressing it twice lists\n\
 all possible completions if more than one is available."),
           &cmdlist);
   add_cmd ("internals", class_maintenance, _("\

diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index fd9e2b7fcff4944511383bbcddeaa08ec0472844..865f89ed9b5894f6da1d99c97e5f42f03a33ebdc 100644 (file)
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -171,7 +171,7 @@ struct cmd_list_element
 
   /* Nonzero says this is an abbreviation, and should not
      be mentioned in lists of commands.
-     This allows "br<tab>" to complete to "break", which it
+     This allows "br<TAB>" to complete to "break", which it
      otherwise wouldn't.  */
   unsigned int abbrev_flag : 1;
 

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 2e3a61d484b5554b6d4959fec18469269a3abae8..ad0a95d257cd236732811ead86069dc07f3b9821 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -838,11 +838,6 @@ proc mi_gdb_test { args } {
                fail "$message (unexpected output)"
            }
            set result 1
-       }
-        "<return>" {
-           send_gdb "\n"
-           perror "Window too small."
-            fail "$message"
        }
         eof {
             perror "Process no longer exists"

diff --git a/gdb/utils.c b/gdb/utils.c
index ceea8317dc5414a573cce176402e46828510e96a..a121a6ea57631941bed75cb3e9811fafb3856f20 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -1483,7 +1483,7 @@ pager_file::prompt_for_continue ()
     }
 
   /* Now we have to do this again, so that GDB will know that it doesn't
-     need to save the ---Type <return>--- line at the top of the screen.  */
+     need to save the ---Type <RET>--- line at the top of the screen.  */
   reinitialize_more_filter ();
   pagination_disabled_for_command = disable_pagination;