Merge branch 'NetHack-3.6.2'

win/curses/cursmain.c

@@ -850,6 +850,9 @@ preference_update(preference)
 void
 curses_preference_update(const char *pref)
 {
+    if (!strcmp(pref, "hilite_status") || !strcmp(pref, "align_status"))
+        status_initialize(REASSESS_ONLY);
+
     if (!strcmp(pref, "align_status")
         || !strcmp(pref, "align_message")) {
         curses_create_main_windows();

win/curses/cursmisc.c

@@ -87,7 +87,10 @@ curses_toggle_color_attr(WINDOW *win, int color, int attr, int onoff)
     int curses_color;
 
     /* if color is disabled, just show attribute */
-    if ((win == mapwin) ? !iflags.wc_color : !iflags.wc2_guicolor) {
+    if ((win == mapwin) ? !iflags.wc_color
+                        /* statuswin is for #if STATUS_HILITES
+                           but doesn't need to be conditional */
+                        : !(iflags.wc2_guicolor || win == statuswin)) {
 #endif
         if (attr != NONE) {
             if (onoff == ON)