Merge branch 'keni-wincw2' into NetHack-3.7

Lots of manually resolved conflicts.
2024-02-15 16:25:12 -05:00
parent b96762cdf0 dbe5c98dca
commit 3d3ce2369c
36 changed files with 1035 additions and 348 deletions
--- a/dat/opthelp
+++ b/dat/opthelp
@@ -163,6 +163,9 @@ autounlock    when attempting to open a locked door or loot     [Apply-Key]
              omitted or skipped and Apply-Key is omitted or you aren't
              carrying an unlocking tool or you decline to use one
 boulder       override the default boulder symbol                       [`]
+crash_email   email address to use when filling in crash reports         []
+crash_name    name to use when filling in crash reports                  []
+crash_urlmax  length of longest url we can generate for a crash report   []
 disclose      the types of information you want         [ni na nv ng nc no]
              offered at the end of the game
              (space separated list of two-character values;