Merge branch 'NetHack-3.6.2'

doc/fixes36.2

@@ -282,6 +282,7 @@ changing Sting's description to be "(weapon in hand) (light blue aura)" was
 	to "(weapon in hand, flickering/glimmering/gleaming light blue)"
 fix bit-use collision between WC2_TERM_SIZE and WC2_RESET_STATUS in
 	include/winprocs.h following a recent merge
+fix foxen pluralization again after underflow remedy reintroduced the problem
 tty: turn off an optimization that is the suspected cause of Windows reported 
 	partial status lines following level changes
 tty: ensure that current status fields are always copied to prior status

src/objnam.c

@@ -2115,7 +2115,7 @@ const char *const *alt_as_is; /* another set like as_is[] */
     /* skip "ox" -> "oxen" entry when pluralizing "<something>ox"
        unless it is muskox */
     if (to_plural && baselen > 2 && !strcmpi(endstring - 2, "ox")
-        && baselen > 5 && strcmpi(endstring - 6, "muskox")) {
+        && !(baselen > 5 && !strcmpi(endstring - 6, "muskox"))) {
         /* "fox" -> "foxes" */
         Strcasecpy(endstring, "es");
         return TRUE;