Tabify more menus

* Status hilites
* Disclose option
* Symbol set selection

src/botl.c

@@ -4539,9 +4539,13 @@ status_hilite_menu(void)
 #endif
         any = cg.zeroany;
         any.a_int = fld + 1;
-        Sprintf(buf, "%-18s", initblstats[i].fldname);
+        if (iflags.menu_tab_sep) {
+            Sprintf(buf, "%s\t", initblstats[i].fldname);
+        } else {
+            Sprintf(buf, "%-18s ", initblstats[i].fldname);
+        }
         if (count)
-            Sprintf(eos(buf), " (%d defined)", count);
+            Sprintf(eos(buf), "(%d defined)", count);
         add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0, ATR_NONE,
                  clr, buf, MENU_ITEMFLAGS_NONE);
     }

src/options.c

@@ -5703,8 +5703,13 @@ handler_disclose(void)
     start_menu(tmpwin, MENU_BEHAVE_STANDARD);
     any = cg.zeroany;
     for (i = 0; i < NUM_DISCLOSURE_OPTIONS; i++) {
-        Sprintf(buf, "%-12s[%c%c]", disclosure_names[i],
-                flags.end_disclose[i], disclosure_options[i]);
+        if (iflags.menu_tab_sep) {
+            Sprintf(buf, "%s\t[%c%c]", disclosure_names[i],
+                    flags.end_disclose[i], disclosure_options[i]);
+        } else {
+            Sprintf(buf, "%-12s[%c%c]", disclosure_names[i],
+                    flags.end_disclose[i], disclosure_options[i]);
+        }
         any.a_int = i + 1;
         add_menu(tmpwin, &nul_glyphinfo, &any, disclosure_options[i],
                  0, ATR_NONE, clr, buf, MENU_ITEMFLAGS_NONE);

src/symbols.c

@@ -979,8 +979,6 @@ symparse_find(const void *bstr_, const void *rec_)
     return 0;
 }
 
-DISABLE_WARNING_FORMAT_NONLITERAL
-
 /*
  * this is called from options.c to do the symset work.
  */
@@ -994,7 +992,7 @@ do_symset(boolean rogueflag)
     menu_item *symset_pick = (menu_item *) 0;
     boolean ready_to_switch = FALSE,
             nothing_to_do = FALSE;
-    char *symset_name, fmtstr[20];
+    char *symset_name;
     struct symsetentry *sl;
     int res, which_set, setcount = 0, chosen = -2, defindx = 0;
     int clr = NO_COLOR;
@@ -1041,7 +1039,6 @@ do_symset(boolean rogueflag)
             return TRUE;
         }
 
-        Sprintf(fmtstr, "%%-%ds %%s", biggest + 2);
         tmpwin = create_nhwindow(NHW_MENU);
         start_menu(tmpwin, MENU_BEHAVE_STANDARD);
         any = cg.zeroany;
@@ -1072,7 +1069,11 @@ do_symset(boolean rogueflag)
                 any.a_int = sl->idx + 2;
                 if (symset_name && !strcmpi(sl->name, symset_name))
                     defindx = any.a_int;
-                Sprintf(buf, fmtstr, sl->name, sl->desc ? sl->desc : "");
+                if (iflags.menu_tab_sep) {
+                    Sprintf(buf, "%s\t%s", sl->name, sl->desc ? sl->desc : "");
+                } else {
+                    Sprintf(buf, "%-*s %s", biggest + 2, sl->name, sl->desc ? sl->desc : "");
+                }
                 add_menu(tmpwin, &nul_glyphinfo, &any, 0, 0,
                          ATR_NONE, clr, buf,
                          (any.a_int == defindx) ? MENU_ITEMFLAGS_SELECTED
@@ -1177,6 +1178,4 @@ do_symset(boolean rogueflag)
     return TRUE;
 }
 
-RESTORE_WARNING_FORMAT_NONLITERAL
-
 /*symbols.c*/