[PATCH 2/2] Regularize spelling of names of keys

[Tom Tromey <tromey@adacore.com>]

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.
---
 gdb/cli/cli-cmds.c               | 4 ++--
 gdb/cli/cli-decode.h             | 2 +-
 gdb/testsuite/lib/mi-support.exp | 5 -----
 gdb/utils.c                      | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 6fa5a61ae02..5cf8f87cd75 100644
--- 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 fd9e2b7fcff..865f89ed9b5 100644
--- 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 1dc389dea71..e21570c88b1 100644
--- 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 ceea8317dc5..a121a6ea576 100644
--- 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;
 

-- 
2.52.0