Merge GDB 7.5.1

gdb/tui/tui-win.c

Index: gdb/tui/tui-win.c
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 0a49697d69e7a9ee944184eee57154837bcc945d..c12f036d501896cab5bfe4e550ecfd4e3a4b4095 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -107,7 +107,7 @@ static void parse_scrolling_args (char *,
 #endif
 
 /* Possible values for tui-border-kind variable.  */
-static const char *tui_border_kind_enums[] = {
+static const char *const tui_border_kind_enums[] = {
   "space",
   "ascii",
   "acs",
@@ -115,7 +115,7 @@ static const char *tui_border_kind_enums[] = {
 };
 
 /* Possible values for tui-border-mode and tui-active-border-mode.  */
-static const char *tui_border_mode_enums[] = {
+static const char *const tui_border_mode_enums[] = {
   "normal",
   "standout",
   "reverse",
@@ -690,13 +690,16 @@ tui_resize_all (void)
 	  if (height_diff < 0)
 	    cmd_split_diff--;
 	  else
-	    cmd_split_diff++;
-	}
+           cmd_split_diff++;
+       }
       /* Now adjust each window.  */
-      clear ();
+      /* erase + clearok are used instead of a straightforward clear as
+         AIX 5.3 does not define clear.  */
+      erase ();
+      clearok (curscr, TRUE);
       refresh ();
       switch (cur_layout)
-	{
+       {
 	case SRC_COMMAND:
 	case DISASSEM_COMMAND:
 	  first_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
@@ -1583,13 +1586,16 @@ parse_scrolling_args (char *arg,
 	      ;
 
 	  if (*buf_ptr != (char) 0)
-	    wname = buf_ptr;
+	    {
+	      wname = buf_ptr;
+
+	      /* Validate the window name.  */
+	      for (i = 0; i < strlen (wname); i++)
+		wname[i] = toupper (wname[i]);
+	    }
 	  else
 	    wname = "?";
 	  
-	  /* Validate the window name.  */
-	  for (i = 0; i < strlen (wname); i++)
-	    wname[i] = toupper (wname[i]);
 	  *win_to_scroll = tui_partial_win_by_name (wname);
 
 	  if (*win_to_scroll == (struct tui_win_info *) NULL