Merge branch 'NetHack-3.6'

win/curses/cursmain.c

@@ -211,8 +211,11 @@ curses_init_nhwindows(int *argcp UNUSED,
     getmaxyx(base_term, term_rows, term_cols);
     counting = FALSE;
     curses_init_options();
-    if ((term_rows < 15) || (term_cols < 40)) {
-        panic("Terminal too small.  Must be minumum 40 width and 15 height");
+    if (term_rows < 15 || term_cols < 40) {
+        panic("Terminal is too small; must have at least %s%s%s.",
+              (term_rows < 15) ? "15 rows" : "",
+              (term_rows < 15 && term_cols < 40) ? " and " : "",
+              (term_cols < 40) ? "40 columns" : "");
     }
     /* during line input, deletes the most recently typed character */
     erase_char = erasechar(); /* <delete>/<rubout> or possibly <backspace> */

win/curses/curswins.c

@@ -504,7 +504,7 @@ curses_puts(winid wid, int attr, const char *text)
     if (curses_is_menu(wid) || curses_is_text(wid)) {
         if (!curses_menu_exists(wid)) {
             impossible(
-                     "curses_puts: Attempted write to nonexistant window %d!",
+                     "curses_puts: Attempted write to nonexistent window %d!",
                        wid);
             return;
         }

win/tty/topl.c

@@ -302,7 +302,7 @@ char c;
     register struct WinDesc *cw = wins[WIN_MESSAGE];
 
     if (cw == (struct WinDesc *) 0)
-        panic("Putsym window MESSAGE nonexistant");
+        panic("Putsym window MESSAGE nonexistent");
 
     switch (c) {
     case '\b':

win/tty/wintty.c

@@ -1055,7 +1055,7 @@ reset_role_filtering()
 
     add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE, "", MENU_UNSELECTED);
     add_menu(win, NO_GLYPH, &any, 0, 0, ATR_NONE,
-             "Uncceptable alignments", MENU_UNSELECTED);
+             "Unacceptable alignments", MENU_UNSELECTED);
     setup_algnmenu(win, FALSE, ROLE_NONE, ROLE_NONE, ROLE_NONE);
 
     end_menu(win, "Pick all that apply");