used, unused variables

some variables marked as unused, are now actually used
some unused variables are eliminated or commented out

win/curses/cursinit.c

@@ -99,7 +99,7 @@ set_window_position(int *winx, int *winy, int *winw, int *winh,
 void
 curses_create_main_windows(void)
 {
-    int min_message_height UNUSED = 1;
+    /* int min_message_height = 1; */
     int message_orientation = 0;
     int status_orientation = 0;
     int border_space = 0;
@@ -133,7 +133,7 @@ curses_create_main_windows(void)
     }
 
     if ((term_cols - border_space) < COLNO) {
-        min_message_height++;
+        /* min_message_height++; */
     }
 
     /* Determine status window orientation */

win/curses/cursstat.c

@@ -301,7 +301,7 @@ draw_horizontal(boolean border)
         cap_and_hunger, exp_points, sho_score, sho_vers,
         /* both height and width get their values set,
          * but only width gets used in this function */
-        height UNUSED, width, w, xtra, clen, x, y, t, ex, ey,
+        height, width, w, xtra, clen, x, y, t, ex, ey,
         condstart = 0, conddummy = 0, versstart = 0;
 #ifdef STATUS_HILITES
     int coloridx = NO_COLOR, attrmask = 0;
@@ -672,6 +672,7 @@ draw_horizontal(boolean border)
         } /* i (fld) */
         wclrtoeol(win); /* [superfluous? draw_status() calls werase()] */
     } /* j (line) */
+    nhUse(height);
     return;
 }