From b5e6840beaeca602d2da505dd3f312c496ea3f72 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 20 Apr 2026 10:31:32 -0400
Subject: [PATCH 01/18] vestigal line removed

Closes #1502
---
 sys/windows/Makefile.nmake | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake
index 50e8084cf..f4be7a51c 100644
--- a/sys/windows/Makefile.nmake
+++ b/sys/windows/Makefile.nmake
@@ -139,8 +139,6 @@ GIT_AVAILABLE = N
 # if next line is commented out, full compiler command lines will be output
 Q=@
 
-SKIP_NETHACKW = N
-
 !IFNDEF LUA_VERSION
 LUAVER=5.4.8
 !ELSE

From 7d377a0f02cc07958065a2d4cd47fdc059a71307 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 20 Apr 2026 20:47:59 -0400
Subject: [PATCH 02/18] clang detection in unix hints

Closes #1500 but it does apply the pull request.
Hopefully, this makes things a little clearer.
---
 sys/unix/hints/include/compiler.370 | 19 ++++++++++++++-----
 sys/unix/hints/linux.370            |  2 +-
 sys/unix/hints/macOS.370            |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/sys/unix/hints/include/compiler.370 b/sys/unix/hints/include/compiler.370
index 100d86299..70f9eadeb 100755
--- a/sys/unix/hints/include/compiler.370
+++ b/sys/unix/hints/include/compiler.370
@@ -14,7 +14,7 @@ CCFLAGS = -g
 
 #If you want to force use of one particular set of compilers, do it
 #here, ahead of the detection, so that the detection will match your
-#choice and set variables CCISCLANG, GCCGTEQ, CLANGPPGTEQ9 etc.
+#choice and set variables CCISCLANG, CCISGCC, GCCGTEQ, CLANGPPGTEQ9 etc.
 #accordingly.
 #
 #CC= gcc
@@ -41,7 +41,7 @@ endif
 # If you want to override the compiler detection just carried out
 # uncomment one of the following pairs. Note, however, that
 # doing this after the detection above will likely result in
-# mismatched variable values for CCISCLANG, GCCGTEQ, CLANGPPGTEQ9 etc.
+# mismatched variable values for CCISCLANG, CCISGCC, GCCGTEQ, CLANGPPGTEQ9 etc.
 #
 #CC= gcc
 #CXX= g++ -std-gnu++11
@@ -72,8 +72,17 @@ CFLAGS+=-Wstrict-prototypes
 CFLAGS+=-Wnonnull
 
 #detection of clang vs gcc
-CCISCLANG := $(shell echo `$(CC) --version` | grep clang)
-ifeq "$(CCISCLANG)" ""
+CCTEST := $(shell echo `$(CC) --version` | grep clang)
+ifneq "$(CCTEST)" ""
+CCISCLANG=1
+CCISGCC=
+else
+CCISCLANG=
+CCISGCC=1
+endif
+#$(info CCISCLANG=$(CCISCLANG), CCISGCC=$(CCISGCC))
+
+ifeq "$(CCISGCC)" "1"
 # gcc-specific follows
 CXX=g++ -std=gnu++11
 # get the version of gcc
@@ -95,8 +104,8 @@ CFLAGS+=-Wimplicit-fallthrough
 #endif
 # end of gcc-specific
 else   # gcc or clang?
-CXX=clang++ -std=gnu++11
 # clang-specific follows
+CXX=clang++ -std=gnu++11
 CLANGGTEQ12 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 12)
 CLANGGTEQ14 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 14)
 CLANGGTEQ21 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 21)
diff --git a/sys/unix/hints/linux.370 b/sys/unix/hints/linux.370
index 3ceb7cda3..8b402350c 100755
--- a/sys/unix/hints/linux.370
+++ b/sys/unix/hints/linux.370
@@ -415,7 +415,7 @@ endif
 SYSCFLAGS=-DLUA_USE_LINUX
 ifdef GITSUBMODULES
 LUAFLAGS=CC='$(CC)' SYSCFLAGS='$(SYSCFLAGS)'
-ifneq "$(CCISCLANG)" ""
+ifeq "$(CCISCLANG)" "1"
 # clang
 LUAFLAGS +=CWARNGCC=''
 endif   # clang
diff --git a/sys/unix/hints/macOS.370 b/sys/unix/hints/macOS.370
index 31279a3cd..02e5dbba6 100755
--- a/sys/unix/hints/macOS.370
+++ b/sys/unix/hints/macOS.370
@@ -338,7 +338,7 @@ endif  # WANT_LIBNH
 # this needs to be passed via make rather than defined in unixconf.h
 ifdef GITSUBMODULES
 LUAFLAGS=CC='$(CC)' MYCFLAGS=' -DLUA_USE_MACOSX'
-ifneq "$(CCISCLANG)" ""
+ifeq "$(CCISCLANG)" "1"
 # clang
 LUAFLAGS +=CWARNGCC=''
 endif   # clang

From 0ca6e6f16fda9d0abbb2e1f418264fb752f71643 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 20 Apr 2026 21:04:22 -0400
Subject: [PATCH 03/18] stray tabs

---
 include/amiconf.h  | 2 +-
 include/winprocs.h | 2 +-
 src/earlyarg.c     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/amiconf.h b/include/amiconf.h
index 77baa09f1..682ed3a2b 100644
--- a/include/amiconf.h
+++ b/include/amiconf.h
@@ -198,7 +198,7 @@ struct ami_sysflags {
     boolean altmeta;  /* use ALT keys as META */
     boolean amiflush; /* kill typeahead */
 #endif
-#ifdef AMII_GRAPHICS	        
+#ifdef AMII_GRAPHICS 
     int numcols;
     unsigned short amii_dripens[20]; /* DrawInfo Pens currently there are 13 in v39 */
     AMII_COLOR_TYPE amii_curmap[AMII_MAXCOLORS]; /* colormap */
diff --git a/include/winprocs.h b/include/winprocs.h
index 0abe61d8c..a60a00c77 100644
--- a/include/winprocs.h
+++ b/include/winprocs.h
@@ -19,7 +19,7 @@ enum wp_ids { wp_tty = 1, wp_X11, wp_Qt, wp_mswin, wp_curses,
 #ifdef OUTDATED_STUFF
               wp_mac, wp_Gem, wp_Gnome,
 #endif
-              wp_trace	// XXX do we need this?  should chainin/out get an id? TBD
+              wp_trace  // XXX do we need this?  should chainin/out get an id? TBD
 };
 
 /* NB: this MUST match chain_procs below */
diff --git a/src/earlyarg.c b/src/earlyarg.c
index 78feae94a..e7a09887a 100755
--- a/src/earlyarg.c
+++ b/src/earlyarg.c
@@ -711,7 +711,7 @@ dump_enums(void)
         objclass_classes_enum,
         objclass_syms_enum,
         arti_enum,
-	mcastu_enum,
+        mcastu_enum,
         NUM_ENUM_DUMPS
     };
 
@@ -743,7 +743,7 @@ dump_enums(void)
         objclass_classes_dump,
         objclass_syms_dump,
         arti_enum_dump,
-	mcastu_enum_dump,
+        mcastu_enum_dump,
     };
 
     static const struct de_params {

From 32acb80174ec29f8adb5a6cb03c14be0b1c71fdc Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 21 Apr 2026 05:13:46 -0400
Subject: [PATCH 04/18] resolve some valid warnings on Windows

../sys/windows/windmain.c:226:12: warning: address of array 'gc.chosen_windowtype' will always
      evaluate to 'true' [-Wpointer-bool-conversion]
  226 |     if (gc.chosen_windowtype && *gc.chosen_windowtype)

../sys/windows/consoletty.c:873:27: warning: address of array 'back->utf8str' will always evaluate
      to 'true' [-Wpointer-bool-conversion]
  873 |                 if (back->utf8str && front->utf8str
      |                     ~~~~~~^~~~~~~ ~~
../sys/windows/consoletty.c:873:45: warning: address of array 'front->utf8str' will always evaluate
      to 'true' [-Wpointer-bool-conversion]
  873 |                 if (back->utf8str && front->utf8str
      |                                   ~~ ~~~~~~~^~~~~~~
---
 sys/windows/consoletty.c | 2 +-
 sys/windows/windmain.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/windows/consoletty.c b/sys/windows/consoletty.c
index 988e7663a..c048a65b6 100644
--- a/sys/windows/consoletty.c
+++ b/sys/windows/consoletty.c
@@ -870,7 +870,7 @@ back_buffer_flip(void)
                     do_anything |= do_wide_content;
             } else {
 #endif
-                if (back->utf8str && front->utf8str
+                if (back->utf8str[0] && front->utf8str[0]
                     && strcmp((const char *) back->utf8str,
                            (const char *) front->utf8str))
                     do_anything |= do_utf8_content;
diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index 8d499cd5d..e15f9a882 100644
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -223,7 +223,7 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
 
 #ifdef EARLY_CONFIGFILE_PASS
     rcfile_interface_options();
-    if (gc.chosen_windowtype && *gc.chosen_windowtype)
+    if (*gc.chosen_windowtype)
         windowtype = gc.chosen_windowtype;
 #endif
 

From 0ef54e364ef55d616bd471c4f41a00ef5bc151cc Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Tue, 21 Apr 2026 05:40:52 -0400
Subject: [PATCH 05/18] more thitu() and Half_physical_damage

As commented in:
https://github.com/NetHack/NetHack/issues/1459#issuecomment-4280354364

This also fixes a minor typo in the related doc/fixes3-7-0.txt paragraph.
---
 doc/fixes3-7-0.txt | 2 +-
 src/mthrowu.c      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index e7e375504..69958e5ec 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -2203,7 +2203,7 @@ mounted hero was able to deliver joust hits when trapped
 timer sanity check for melting ice gave false complaint about non-ice for
 	frozen moat under open drawbridge
 mhitm_ad_phys() was not applying Half_physical_damage when hero was target
-callers of thitu() were not applyibg Half_physical_damage either
+callers of thitu() were not applying Half_physical_damage either
 throwing crystal plate mail or helm of brilliance up against the ceiling could
 	result in the item being cracked and then vanishing
 yn_function (used all over the place) sometimes triggered an impossible()
diff --git a/src/mthrowu.c b/src/mthrowu.c
index 1e9a299c6..465a69d89 100644
--- a/src/mthrowu.c
+++ b/src/mthrowu.c
@@ -737,7 +737,8 @@ m_throw(
                     hitv += 8 + singleobj->spe;
                     if (dam < 1)
                         dam = 1;
-                    hitu = thitu(hitv, dam, &singleobj, (char *) 0);
+                    hitu = thitu(hitv, Maybe_Half_Phys(dam),
+                                 &singleobj, (char *) 0);
                 }
             }
             if (hitu && singleobj->opoisoned && is_poisonable(singleobj)) {
@@ -1233,7 +1234,7 @@ thrwmu(struct monst *mtmp)
         if (dam < 1)
             dam = 1;
 
-        (void) thitu(hitv, dam, &otmp, (char *) 0);
+        (void) thitu(hitv, Maybe_Half_Phys(dam), &otmp, (char *) 0);
         stop_occupation();
         return;
     } else if ((arw = autoreturn_weapon(otmp)) != 0 && !mwelded(otmp)) {

From 2b74dce88c2a344fabc17678e181cea3939054ea Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Tue, 21 Apr 2026 11:33:09 -0700
Subject: [PATCH 06/18] still more thitu() and Half_physical_damage

Half_physical_damage does not reduce damage from acid.
---
 src/mthrowu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mthrowu.c b/src/mthrowu.c
index 465a69d89..6f8ed721c 100644
--- a/src/mthrowu.c
+++ b/src/mthrowu.c
@@ -737,8 +737,9 @@ m_throw(
                     hitv += 8 + singleobj->spe;
                     if (dam < 1)
                         dam = 1;
-                    hitu = thitu(hitv, Maybe_Half_Phys(dam),
-                                 &singleobj, (char *) 0);
+                    if (singleobj->otyp != ACID_VENOM)
+                        dam = Maybe_Half_Phys(dam);
+                    hitu = thitu(hitv, dam, &singleobj, (char *) 0);
                 }
             }
             if (hitu && singleobj->opoisoned && is_poisonable(singleobj)) {

From 0a51a9656e38f2255adfc48811f14cfc3f69645f Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Tue, 21 Apr 2026 20:55:39 -0700
Subject: [PATCH 07/18] address issue #1499 - saving grace vs traps

Issue reported by Shrigis1:  hero at or close to full HP stepped on
a not-yet-discovered rolling boulder trap and was killed; end-of-game
disclosure reported "You could have avoided a one-shot death via
saving-grace."

Originally, saving grace was completely hidden, so the disclosure
line wouldn't have been included.  Once disclosure was incorporated,
having saving grace not work for traps triggered by the hero seems
counter-intuitive, regardless of whether player is aware of the trap.

This makes saving grace apply to any damage applied by losehp().  The
original purpose of unexpectedly survivng by the skin of one's teeth
is still maintained.

Aside from having more of a chance of surviving via saving-grace,
the main difference is that some players might try for "survived by
saving-grace" as an unofficial conduct.  As long as we don't start
tracking that as a conduct, I don't think this is a big deal.

Fixes #1499
---
 src/hack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hack.c b/src/hack.c
index ce0c488c8..367591eff 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -4251,12 +4251,12 @@ saving_grace(int dmg)
         impossible("saving_grace check for negative damage? (%d)", dmg);
         return 0;
     }
-
+#if 0   /* saving grace _does_ protect hero during own actions */
     if (!svc.context.mon_moving) {
         /* saving grace doesn't protect you from your own actions */
         return dmg;
     }
-
+#endif
     if (dmg < u.uhp || u.uhp <= 0) {
         /* no need for saving grace */
         return dmg;

From 965e1bf99db1e81c56165ef78e2ff742a19e5a4f Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Wed, 22 Apr 2026 11:15:19 -0400
Subject: [PATCH 08/18] make program_state initialization a discrete step

Having it rolled into decl_globals_init() was
causing some early options to misbehave because
those early options were trying to use program_state
fields to determine their behavior, but decl_globals_init()
was resetting the program_state fields that were being used
to do that.
---
 include/extern.h | 1 +
 src/allmain.c    | 1 +
 src/decl.c       | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/extern.h b/include/extern.h
index 67fc2292d..c8140e68e 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -510,6 +510,7 @@ extern void destroy_drawbridge(coordxy, coordxy);
 
 /* ### decl.c ### */
 
+extern void program_state_init(void);
 extern void decl_globals_init(void);
 extern void sa_victual(volatile struct victual_info *);
 
diff --git a/src/allmain.c b/src/allmain.c
index efa2e42e7..5a05add72 100644
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -32,6 +32,7 @@ staticfn void interrupt_multi(const char *);
 void
 early_init(int argc USED_FOR_CRASHREPORT, char *argv[] USED_FOR_CRASHREPORT)
 {
+    program_state_init();
 #ifdef CRASHREPORT
     /* Do this as early as possible, but let ports do other things first. */
     crashreport_init(argc, argv);
diff --git a/src/decl.c b/src/decl.c
index f229de737..66f3d060e 100644
--- a/src/decl.c
+++ b/src/decl.c
@@ -1063,6 +1063,12 @@ const struct const_globals cg = {
         }                                                                  \
     } while(0);
 
+void
+program_state_init(void)
+{
+    program_state = init_program_state;
+}
+
 void
 decl_globals_init(void)
 {
@@ -1114,7 +1120,6 @@ decl_globals_init(void)
     svu = init_svu;
     svx = init_svx;
     svy = init_svy;
-    program_state = init_program_state;
 
     gv.valuables[0].list = gg.gems;
     gv.valuables[0].size = SIZE(gg.gems);

From 09cb9e2425224a4050fbbbfdf8bbd0dbd10e4c98 Mon Sep 17 00:00:00 2001
From: Barry Nelson <abcbarryn@users.noreply.github.com>
Date: Wed, 22 Apr 2026 21:33:50 -0400
Subject: [PATCH 09/18] Fixed corridor symbols in Enhanced1 PR #1503

This is the Enhanced1 symbols changes that were part of
GitHub pull request #1503
https://github.com/NetHack/NetHack/pull/1503

This is not the full pull request.
---
 dat/symbols | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dat/symbols b/dat/symbols
index f2bc486fa..e981b3498 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -807,6 +807,11 @@ start: Enhanced1
 	Description: Enhanced with Unicode glyphs and 24-bit color
 	Restrictions: primary
 	Handling: UTF8
+	S_corr: U+2591
+	S_litcorr: U+2592
+	S_engrcorr: U+2591
+	S_amulet: U+2299                    # ☉
+	S_cloud: U+2601                     # ☁
 	S_vwall: U+2502                     # BOX DRAWINGS LIGHT VERTICAL
 	S_hwall: U+2500                     # BOX DRAWINGS LIGHT HORIZONTAL
 	S_tlcorn: U+250c                    # BOX DRAWINGS LIGHT DOWN AND RIGHT
@@ -821,8 +826,8 @@ start: Enhanced1
 	S_ndoor: U+00b7                     # MIDDLE DOT
 	S_vodoor: U+2592                    # MEDIUM SHADE
 	S_hodoor: U+2592                    # MEDIUM SHADE
-	S_bars: U+2261                      # IDENTICAL TO
-	S_tree: U+03a8                      # GREEK CAPITAL LETTER PSI
+	S_bars: U+2551                      # ║
+	S_tree: U+2660                      # ♠
 	S_room: U+00b7                      # MIDDLE DOT
 	S_engroom: U+03BE                   # Greek Small Letter Xi
 	S_darkroom: U+00b7                  # MIDDLE DOT

From 25849ac5a218230090928130864bd6445e240624 Mon Sep 17 00:00:00 2001
From: Barry Nelson <abcbarryn@users.noreply.github.com>
Date: Wed, 22 Apr 2026 21:48:30 -0400
Subject: [PATCH 10/18] enhanced2 unicode symset w/ double line symbols

This is from PR #1503 on GitHub, contributed by @abcbarryn.

Closes #1503
---
 dat/symbols | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/dat/symbols b/dat/symbols
index e981b3498..037e60237 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -900,6 +900,109 @@ start: Enhanced1
 	G_trwall_mines: U+251C/113-126-142
 finish
 
+start: Enhanced2
+#       contributed in GitHub pull request 1503 by abcbarryn.
+#       This has double line symbols.
+	Description: Enhanced with Unicode glyphs and 24-bit color
+	Restrictions: primary
+	Handling: UTF8
+	S_corr: U+2591
+	S_litcorr: U+2592
+	S_engrcorr: U+2591
+	S_amulet: U+2299                    # ☉
+	S_cloud: U+2601                     # ☁
+	S_vwall: U+2551                     # ║ BOX DRAWINGS DOUBLE VERTICAL
+	S_hwall: U+2550                     # ═ BOX DRAWINGS DOUBLE HORIZONTAL
+	S_tlcorn: U+2554                    # ╔ BOX DRAWINGS DOUBLE DOWN AND RIGHT
+	S_trcorn: U+2557                    # ╗ BOX DRAWINGS DOUBLE DOWN AND LEFT
+	S_blcorn: U+255a                    # ╚ BOX DRAWINGS DOUBLE UP AND RIGHT
+	S_brcorn: U+255d                    # ╝ BOX DRAWINGS DOUBLE UP AND LEFT
+	S_crwall: U+256c                    # ╬ BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+	S_tuwall: U+2569                    # ╩ BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+	S_tdwall: U+2566                    # ╦ BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+	S_tlwall: U+2563                    # ╣ BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+	S_trwall: U+2560                    # ╠ BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+	S_ndoor: U+00b7                     # MIDDLE DOT
+	S_vodoor: U+2592                    # MEDIUM SHADE
+	S_hodoor: U+2592                    # MEDIUM SHADE
+#	S_bars: U+2261                      # IDENTICAL TO
+	S_bars: U+2980                      # ⦀
+#	S_tree: U+03a8                      # GREEK CAPITAL LETTER PSI
+#	S_tree: U+1F332                     # 🌲
+	S_tree: U+2660                      # ♠
+	S_room: U+00b7                      # MIDDLE DOT
+	S_engroom: U+03BE                   # Greek Small Letter Xi
+	S_darkroom: U+00b7                  # MIDDLE DOT
+	S_upladder: U+2264                  # LESS-THAN OR EQUAL TO
+	S_dnladder: U+2265                  # GREATER-THAN OR EQUAL TO
+	S_altar: U+03A9                     # GREEK CAPITAL LETTER OMEGA
+	S_grave: U+2020                     # DAGGER
+	G_fountain: U+2320/0-150-255        # TOP HALF INTEGRAL
+	S_pool: U+224b                      # TRIPLE TILDE
+	S_ice: U+00b7                       # MIDDLE DOT
+#	S_ice: U+2744                       # ❄️
+	S_lava: U+224b                      # TRIPLE TILDE
+	S_lavawall: U+2248                  # ALMOST EQUAL TO
+	S_vodbridge: U+00b7                 # MIDDLE DOT
+	S_hodbridge: U+00b7                 # MIDDLE DOT
+	S_water: U+2248                     # ALMOST EQUAL TO
+	S_web: U+00A4                       # CURRENCY SIGN
+	S_vbeam: U+2502                     # BOX DRAWINGS LIGHT VERTICAL
+	S_hbeam: U+2500                     # BOX DRAWINGS LIGHT HORIZONTAL
+	S_sw_tc: U+2594                     # UPPER ONE EIGHTH BLOCK
+	S_sw_ml: U+258f                     # LEFT ONE EIGHTH BLOCK
+	S_sw_mr: U+2595                     # RIGHT ONE EIGHTH BLOCK
+	S_sw_bc: U+2581                     # LOWER ONE EIGHTH BLOCK
+	S_expl_tc: U+2594                   # UPPER ONE EIGHTH BLOCK
+	S_expl_ml: U+258f                   # LEFT ONE EIGHTH BLOCK
+	S_expl_mr: U+2595                   # RIGHT ONE EIGHTH BLOCK
+	S_expl_bc: U+2581                   # LOWER ONE EIGHTH BLOCK
+	G_vwall_sokoban:  U+2502/blue
+	G_hwall_sokoban:  U+2500/blue
+	G_tlcorn_sokoban: U+250c/blue
+	G_trcorn_sokoban: U+2510/blue
+	G_blcorn_sokoban: U+2514/blue
+	G_brcorn_sokoban: U+2518/blue
+	G_crwall_sokoban: U+253C/blue
+	G_tuwall_sokoban: U+2534/blue
+	G_tdwall_sokoban: U+252C/blue
+	G_tlwall_sokoban: U+2524/blue
+	G_trwall_sokoban: U+251C/blue
+	G_vwall_gehennom:  U+2502/red
+	G_hwall_gehennom:  U+2500/red
+	G_tlcorn_gehennom: U+250c/red
+	G_trcorn_gehennom: U+2510/red
+	G_blcorn_gehennom: U+2514/red
+	G_brcorn_gehennom: U+2518/red
+	G_crwall_gehennom: U+253C/red
+	G_tuwall_gehennom: U+2534/red
+	G_tdwall_gehennom: U+252C/red
+	G_tlwall_gehennom: U+2524/red
+	G_trwall_gehennom: U+251C/red
+	G_vwall_knox:  U+2502/150-75-0
+	G_hwall_knox:  U+2500/150-75-0
+	G_tlcorn_knox: U+250c/150-75-0
+	G_trcorn_knox: U+2510/150-75-0
+	G_blcorn_knox: U+2514/150-75-0
+	G_brcorn_knox: U+2518/150-75-0
+	G_crwall_knox: U+253C/150-75-0
+	G_tuwall_knox: U+2534/150-75-0
+	G_tdwall_knox: U+252C/150-75-0
+	G_tlwall_knox: U+2524/150-75-0
+	G_trwall_knox: U+251C/150-75-0
+	G_vwall_mines:  U+2502/113-126-142
+	G_hwall_mines:  U+2500/113-126-142
+	G_tlcorn_mines: U+250c/113-126-142
+	G_trcorn_mines: U+2510/113-126-142
+	G_blcorn_mines: U+2514/113-126-142
+	G_brcorn_mines: U+2518/113-126-142
+	G_crwall_mines: U+253C/113-126-142
+	G_tuwall_mines: U+2534/113-126-142
+	G_tdwall_mines: U+252C/113-126-142
+	G_tlwall_mines: U+2524/113-126-142
+	G_trwall_mines: U+251C/113-126-142
+finish
+
 start: AmigaFont
 	Description: Amiga hack.font line-drawing and effect characters
 	# Dungeon features

From 21f0e185959392f391ba01f1b2f6558ee9778aa8 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 23 Apr 2026 15:51:32 +0300
Subject: [PATCH 11/18] Fix visual reset in simple options

Switching symset in simple options menu did not reset the
map glyphs corectly.  Just call the same routine for resetting
visuals as in the #optionsfull command.
---
 src/options.c | 39 ++++++---------------------------------
 1 file changed, 6 insertions(+), 33 deletions(-)

diff --git a/src/options.c b/src/options.c
index 02606b509..55a4ad0bc 100644
--- a/src/options.c
+++ b/src/options.c
@@ -8697,8 +8697,8 @@ doset_simple_menu(void)
 int
 doset_simple(void)
 {
-    int pickedone = 0,
-        opt_crt_flags = docrtNocls;
+    int pickedone = 0;
+    boolean flush = FALSE;
 
     if (iflags.menu_requested) {
         /* doset() checks for 'm' and calls doset_simple(); clear the
@@ -8713,40 +8713,13 @@ doset_simple(void)
     give_opt_msg = FALSE;
     do {
         pickedone = doset_simple_menu();
+        flush = go.opt_need_redraw;
 
-        /* some option choices warrant immediate updating beyond the
-           option value itself */
-        if (go.opt_need_glyph_reset) {
-            reset_glyphmap(gm_optionchange);
-        }
-        if (go.opt_need_redraw) {
-            check_gold_symbol();
-            reglyph_darkroom();
-            if (go.opt_symset_changed)
-                opt_crt_flags &= ~docrtRefresh;
-            docrt_flags(opt_crt_flags);
+        reset_needed_visuals();
+        if (flush) {
             flush_screen(1);
+            flush = FALSE;
         }
-        if (go.opt_need_promptstyle)
-            adjust_menu_promptstyle(WIN_INVEN, &iflags.menu_headings);
-        if (go.opt_update_basic_palette) {
-#ifdef CHANGE_COLOR
-            change_palette();
-#endif
-            go.opt_update_basic_palette = FALSE;
-        }
-        if (go.opt_reset_customcolors || go.opt_reset_customsymbols) {
-            if (go.opt_reset_customcolors)
-                reset_customcolors();
-            if (go.opt_reset_customsymbols)
-                reset_customsymbols();
-            docrt_flags(opt_crt_flags);
-        }
-        /* status may need updating if terminal is tall enough that
-           doset_simple menu doesn't cover up status or wide enough for
-           curses to honor player's choice of align_status:Right|Left */
-        if (disp.botl || disp.botlx)
-            bot();
     } while (pickedone > 0);
     give_opt_msg = TRUE;
     return ECMD_OK;

From 93ab8405d87d20a0375d5477f2b654f4fcaf4b4f Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Thu, 23 Apr 2026 14:31:43 -0400
Subject: [PATCH 12/18] some further startup, option processing bits

---
 src/earlyarg.c         |  5 +++++
 src/options.c          |  2 +-
 src/symbols.c          |  4 ++--
 sys/unix/unixmain.c    |  4 ----
 sys/windows/windmain.c | 15 +++++++++------
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/earlyarg.c b/src/earlyarg.c
index e7a09887a..352a9cf46 100755
--- a/src/earlyarg.c
+++ b/src/earlyarg.c
@@ -182,6 +182,11 @@ early_options(int *argc_p, char ***argv_p, char **hackdir_p)
     char **argv, *arg, *origarg;
     int argc, oldargc, ndx = 0, consumed = 0;
 
+#ifdef ENHANCED_SYMBOLS
+    if (argcheck(*argc_p, *argv_p, ARG_DUMPGLYPHIDS) == 2)
+        opt_terminate();
+#endif
+
     config_error_init(FALSE, "command line", FALSE);
 
     /* treat "nethack ?" as a request for usage info; due to shell
diff --git a/src/options.c b/src/options.c
index 55a4ad0bc..69283567e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -7368,7 +7368,7 @@ initoptions_finish(void)
 #ifdef ENHANCED_SYMBOLS
     if (glyphid_cache_status())
         free_glyphid_cache();
-    apply_customizations(gc.currentgraphics, do_custom_symbols);
+    apply_customizations(gc.currentgraphics, do_custom_symbols | do_custom_colors);
 #endif
     go.opt_initial = FALSE;
     return;
diff --git a/src/symbols.c b/src/symbols.c
index 7c32af3e3..0d60df7b2 100644
--- a/src/symbols.c
+++ b/src/symbols.c
@@ -638,14 +638,14 @@ parse_sym_line(char *buf, int which_set)
 #ifdef ENHANCED_SYMBOLS
             } else {
                 if (gc.chosen_symset_start) {
-                    glyphrep_to_custom_map_entries(buf, &glyph);
+                    (void) glyphrep_to_custom_map_entries(buf, &glyph);
                 }
 #endif
             }
         }
     } else if (gc.chosen_symset_start) {
         /* glyph, not symbol */
-        glyphrep_to_custom_map_entries(buf, &glyph);
+        (void) glyphrep_to_custom_map_entries(buf, &glyph);
     }
 #ifndef ENHANCED_SYMBOLS
     nhUse(glyph);
diff --git a/sys/unix/unixmain.c b/sys/unix/unixmain.c
index 65a5401c4..ad2cef7de 100644
--- a/sys/unix/unixmain.c
+++ b/sys/unix/unixmain.c
@@ -123,10 +123,6 @@ main(int argc, char *argv[])
         dir = nh_getenv("HACKDIR");
 #endif /* CHDIR */
     program_state.early_options = 1;
-#ifdef ENHANCED_SYMBOLS
-    if (argcheck(argc, argv, ARG_DUMPGLYPHIDS) == 2)
-        exit(EXIT_SUCCESS);
-#endif
     /* handle -dalthackdir, -s <score stuff>, --version, --showpaths */
     early_options(&argc, &argv, &dir);
     program_state.early_options = 0;
diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index e15f9a882..99567f9d2 100644
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -167,12 +167,6 @@ MAIN(int argc, char *argv[])
     /* setting iflags.colorcount has to be after early_init()
      * because it zeros out all of iflags */
     hwnd = GetDesktopWindow();
-    hdc = GetDC(hwnd);
-    if (hdc) {
-        bpp = GetDeviceCaps(hdc, BITSPIXEL);
-        iflags.colorcount = (bpp >= 16) ? 16777216 : (bpp >= 8) ? 256 : 16;
-        ReleaseDC(hwnd, hdc);
-    }
 
 #ifdef _MSC_VER
 #ifdef DEBUG
@@ -201,6 +195,15 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
 #ifndef MSWIN_GRAPHICS
     early_init(argc, argv); /* already in WinMain for MSWIN_GRAPHICS */
 #endif
+
+    /* this must be done after early_init() because early_init()
+       sets iflags to zero */
+    hdc = GetDC(hwnd);
+    if (hdc) {
+        bpp = GetDeviceCaps(hdc, BITSPIXEL);
+        iflags.colorcount = (bpp >= 16) ? 16777216 : (bpp >= 8) ? 256 : 16;
+        ReleaseDC(hwnd, hdc);
+    }
     gh.hname = "NetHack"; /* used for syntax messages */
     set_default_prefix_locations(
         argv[0]); /* must be re-done after initoptions_init()

From 020604291d33d75f92240a0649d24dae5e6695f1 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Thu, 23 Apr 2026 12:07:31 -0700
Subject: [PATCH 13/18] display buglet: newsym(0,0)

Starting a new game as a monk was calling newsym(0,0).

<0,0> is within array bounds but off the map.  Have newsym() check the
coordinates it receives.
---
 doc/fixes3-7-0.txt |  6 +++++-
 src/attrib.c       |  6 +++---
 src/display.c      | 19 ++++++++++++++-----
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index 69958e5ec..1f281f47c 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1,4 +1,4 @@
-NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1614 $ $NHDT-Date: 1769342601 2026/01/25 04:03:21 $
+NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.1649 $ $NHDT-Date: 1777000050 2026/04/23 19:07:30 $
 
 General Fixes and Modified Features
 -----------------------------------
@@ -1598,6 +1598,10 @@ prevent selecting all options in #optionsfull menu
 shapeshifters change shape less
 rolling boulder traps aren't removed when stepped on and move boulders
         pushed onto them
+when starting a new game as a monk, newsym(0,0) was being called (adjabil ->
+	postadjabil -> see_monsters when initializing See_invisible as hero
+	became level 1; seen 'monster' was the hero who hadn't been placed
+	on the map yet)
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
diff --git a/src/attrib.c b/src/attrib.c
index 23e8117c7..27f454fd8 100644
--- a/src/attrib.c
+++ b/src/attrib.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	attrib.c	$NHDT-Date: 1754979443 2025/08/11 22:17:23 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.134 $ */
+/* NetHack 3.7	attrib.c	$NHDT-Date: 1777000050 2026/04/23 19:07:30 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.137 $ */
 /*      Copyright 1988, 1989, 1990, 1992, M. Stephenson           */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -107,7 +107,7 @@ static const struct innate {
 staticfn void exerper(void);
 staticfn int rnd_attr(void);
 staticfn int init_attr_role_redist(int, boolean);
-staticfn void postadjabil(long *);
+staticfn void postadjabil(long *) NONNULLARG1;
 staticfn const struct innate *role_abil(int);
 staticfn const struct innate *check_innate_abil(long *, long);
 staticfn int innately(long *);
@@ -779,7 +779,7 @@ staticfn
 void
 postadjabil(long *ability)
 {
-    if (!ability)
+    if (!u.ulevel) /* initializing hero; don't attempt screen update yet */
         return;
     if (ability == &(HWarning) || ability == &(HSee_invisible))
         see_monsters();
diff --git a/src/display.c b/src/display.c
index 5f854c64d..d3241ce9f 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	display.c	$NHDT-Date: 1745114235 2025/04/19 17:57:15 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.260 $ */
+/* NetHack 3.7	display.c	$NHDT-Date: 1777000050 2026/04/23 19:07:30 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.263 $ */
 /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
 /* and Dave Cohrs, 1990.                                          */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -753,10 +753,9 @@ feel_location(coordxy x, coordxy y)
     /* replicate safeguards used by newsym(); might not be required here */
     if (_suppress_map_output())
         return;
-
     if (!isok(x, y))
         return;
-    lev = &(levl[x][y]);
+    lev = &levl[x][y];
     /* If hero's memory of an invisible monster is accurate, we want to keep
      * him from detecting the same monster over and over again on each turn.
      * We must return (so we don't erase the monster).  (We must also, in the
@@ -917,15 +916,24 @@ feel_location(coordxy x, coordxy y)
 void
 newsym(coordxy x, coordxy y)
 {
+    struct rm *lev;
+    struct engr *ep;
     struct monst *mon;
     int see_it;
     boolean worm_tail;
-    struct rm *lev = &(levl[x][y]);
-    struct engr *ep;
 
     /* don't try to produce map output when level is in a state of flux */
     if (_suppress_map_output())
         return;
+    /* should never happen; same error handling as u_on_newpos() */
+    if (!isok(x, y)) {
+        void (*errfunc)(const char *, ...) PRINTF_F_PTR(1, 2);
+
+        errfunc = (x < 0 || y < 0 || x > COLNO - 1 || y > ROWNO - 1) ? panic
+                  : impossible; /* misuse of column 0 is less severe */
+        (*errfunc)("newsym: attempting screen update for <%d,%d>", x, y);
+        return;
+    }
 
     /* only permit updating the hero when swallowed */
     if (u.uswallow) {
@@ -939,6 +947,7 @@ newsym(coordxy x, coordxy y)
         if (!(is_pool_or_lava(x, y) || is_ice(x, y)) || !next2u(x, y))
             return;
     }
+    lev = &levl[x][y];
 
     /* Can physically see the location. */
     if (cansee(x, y)) {

From 1556aec451942bf7b61f04f42247aea9edbb4666 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Thu, 23 Apr 2026 15:28:20 -0400
Subject: [PATCH 14/18] formatting (line length) bit

---
 src/options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/options.c b/src/options.c
index 69283567e..786c5757e 100644
--- a/src/options.c
+++ b/src/options.c
@@ -7368,7 +7368,8 @@ initoptions_finish(void)
 #ifdef ENHANCED_SYMBOLS
     if (glyphid_cache_status())
         free_glyphid_cache();
-    apply_customizations(gc.currentgraphics, do_custom_symbols | do_custom_colors);
+    apply_customizations(gc.currentgraphics,
+                         do_custom_symbols | do_custom_colors);
 #endif
     go.opt_initial = FALSE;
     return;

From b196863bbdca5f2395abad88eb0f411663b0cf8b Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Thu, 23 Apr 2026 13:31:56 -0700
Subject: [PATCH 15/18] reroll feedback

All the conduct feedback via "you ..." is directed at the character, so
seeing "you have rerolled your character 3 times" in conduct disclosure
looked strange.  Change that to "your character was rerolled 3 times."
---
 src/insight.c | 103 ++++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/src/insight.c b/src/insight.c
index 9f3763619..ab2bcd1a1 100644
--- a/src/insight.c
+++ b/src/insight.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7	insight.c	$NHDT-Date: 1737384766 2025/01/20 06:52:46 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.128 $ */
+/* NetHack 3.7	insight.c	$NHDT-Date: 1777004419 2026/04/23 20:20:19 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.134 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -16,13 +16,14 @@
 
 staticfn void enlght_out(const char *);
 staticfn void enlght_line(const char *, const char *, const char *,
-                        const char *);
+                          const char *);
 staticfn char *enlght_combatinc(const char *, int, int, char *);
 staticfn void enlght_halfdmg(int, int);
 staticfn boolean walking_on_water(void);
 staticfn boolean cause_known(int);
 staticfn char *attrval(int, int, char *);
 staticfn char *fmt_elapsed_time(char *, int);
+staticfn char *N_times(long, char *) NONNULL NONNULLARG2;
 staticfn void background_enlightenment(int, int);
 staticfn void basics_enlightenment(int, int);
 staticfn void characteristics_enlightenment(int, int);
@@ -356,6 +357,28 @@ fmt_elapsed_time(char *outbuf, int final)
     return outbuf;
 }
 
+/* "once" vs "twice" vs "17 times", used in several places */
+staticfn char *
+N_times(long n, char *outbuf)
+{
+    switch (n) {
+    case 0:
+    default:
+        Sprintf(outbuf, "%ld times", n);
+        break;
+    case 1:
+        Strcpy(outbuf, "once");
+        break;
+    case 2:
+        Strcpy(outbuf, "twice");
+        break;
+    case 3:
+        Strcpy(outbuf, "thrice");
+        break;
+    }
+    return outbuf;
+}
+
 void
 enlightenment(
     int mode,  /* BASICENLIGHTENMENT | MAGICENLIGHTENMENT (| both) */
@@ -1972,23 +1995,10 @@ attributes_enlightenment(
         buf[0] = '\0';
         if (final < 2) { /* still in progress, or quit/escaped/ascended */
             p = "survived after being killed ";
-            switch (u.umortality) {
-            case 0:
+            if (!u.umortality)
                 p = !final ? (char *) 0 : "survived";
-                break;
-            case 1:
-                Strcpy(buf, "once");
-                break;
-            case 2:
-                Strcpy(buf, "twice");
-                break;
-            case 3:
-                Strcpy(buf, "thrice");
-                break;
-            default:
-                Sprintf(buf, "%d times", u.umortality);
-                break;
-            }
+            else
+                (void) N_times((long) u.umortality, buf);
         } else { /* game ended in character's death */
             p = "are dead";
             switch (u.umortality) {
@@ -2093,13 +2103,26 @@ doconduct(void)
 void
 show_conduct(int final)
 {
-    char buf[BUFSZ];
+    char buf[BUFSZ], bufN[40];
     int ngenocided;
 
     /* Create the conduct window */
     ge.en_win = create_nhwindow(NHW_MENU);
     putstr(ge.en_win, 0, "Voluntary challenges:");
 
+    /* rerolling; "You <this or that>" is about the character, rerolling
+       is about the player so phrase it differently;
+       also, always use past tense since the chance to do something with it
+       is gone by time player can issue #conduct command or see disclosure */
+    if (!u.uroleplay.reroll)
+        Strcpy(buf, " Character rerolling was not enabled.");
+    else if (!u.uroleplay.numrerolls)
+        Strcpy(buf, " Your character was not rerolled.");
+    else
+        Sprintf(buf, " Your character was rerolled %s.",
+                N_times(u.uroleplay.numrerolls, bufN));
+    enlght_out(buf);
+
     if (u.uroleplay.blind)
         you_have_been("blind from birth");
     if (u.uroleplay.deaf)
@@ -2109,12 +2132,6 @@ show_conduct(int final)
     if (u.uroleplay.pauper)
         enl_msg(You_, gi.invent ? "started" : "are", "started out",
                 " without possessions", "");
-    if (u.uroleplay.reroll) {
-        Sprintf(buf, "rerolled your character %ld time%s",
-                u.uroleplay.numrerolls, plur(u.uroleplay.numrerolls));
-        you_have_X(buf);
-    }
-
     /* nudist is far more than a subset of possessionless, and a much
        more impressive accomplishment, but showing "started out without
        possessions" before "faithfully nudist" looks more logical */
@@ -2214,25 +2231,13 @@ show_conduct(int final)
     if (sokoban_in_play()) {
         const char *presentverb = "have violated", *pastverb = "violated";
 
-        Strcpy(buf, " the special Sokoban rules ");
-        switch (u.uconduct.sokocheat) {
-        case 0L:
+        if (!u.uconduct.sokocheat) {
             presentverb = "have not violated";
             pastverb = "did not violate";
             Strcpy(buf, " any of the special Sokoban rules");
-            break;
-        case 1L:
-            Strcat(buf, "once");
-            break;
-        case 2L:
-            Strcat(buf, "twice");
-            break;
-        case 3L:
-            Strcat(buf, "thrice");
-            break;
-        default:
-            Sprintf(eos(buf), "%ld times", u.uconduct.sokocheat);
-            break;
+        } else {
+            Strcpy(buf, " the special Sokoban rules ");
+            Strcat(buf, N_times(u.uconduct.sokocheat, bufN));
         }
         enl_msg(You_, presentverb, pastverb, buf, "");
     }
@@ -2899,19 +2904,9 @@ list_vanquished(char defquery, boolean ask)
                     Sprintf(buf, "%s%s",
                             !type_is_pname(&mons[i]) ? "the " : "",
                             mons[i].pmnames[NEUTRAL]);
-                    if (nkilled > 1) {
-                        switch (nkilled) {
-                        case 2:
-                            Sprintf(eos(buf), " (twice)");
-                            break;
-                        case 3:
-                            Sprintf(eos(buf), " (thrice)");
-                            break;
-                        default:
-                            Sprintf(eos(buf), " (%d times)", nkilled);
-                            break;
-                        }
-                    }
+                    if (nkilled > 1)
+                        Sprintf(eos(buf), " (%s)",
+                                N_times((long) nkilled, buftoo));
                     was_uniq = TRUE;
                 } else {
                     if (uniq_header && was_uniq) {

From 34b85dbea6b140eb9f4d7aa76776e27d8b5846a7 Mon Sep 17 00:00:00 2001
From: Patric Mueller <bhaak@gmx.net>
Date: Thu, 23 Apr 2026 13:15:35 +0200
Subject: [PATCH 16/18] Partly revert changes to Enhanced1 symset

Keep Enhanced1 as a conservative symset that should work everywhere.

Added description on the scope of the different Unicode symsets.
---
 dat/symbols | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/dat/symbols b/dat/symbols
index 037e60237..2ea87b681 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -803,15 +803,33 @@ start: MACgraphics
 	S_pool: \xe0
 finish
 
+# When using Unicode glyphs, care must be taken with how terminals
+# render them and how completely fonts cover them.
+#
+# Depending on the font, terminal, and operating system, unsupported
+# glyphs may be replaced by placeholder symbols (e.g. � U+FFFD
+# replacement character or □ U+25A1 white square), omitted entirely, or
+# substituted from fallback fonts. Such fallback can introduce visual
+# inconsistencies due to differences in style, metrics, or alignment.
+#
+# Support for glyphs defined in the Windows Glyph List 4
+# (https://en.wikipedia.org/wiki/WGL4) is generally good across common
+# fonts and platforms. Beyond that baseline, coverage becomes less
+# predictable and should be evaluated case by case.
+#
+# Emoji support often is problematic, and wide glyphs occupy two display
+# columns, which NetHack does not support.
+#
+# Symset Enhanced1 should be considered the conservative Unicode symset,
+# while Enhanced2 (and any future symsets) may make use of more advanced
+# Unicode features.
 start: Enhanced1
 	Description: Enhanced with Unicode glyphs and 24-bit color
 	Restrictions: primary
 	Handling: UTF8
-	S_corr: U+2591
-	S_litcorr: U+2592
-	S_engrcorr: U+2591
-	S_amulet: U+2299                    # ☉
-	S_cloud: U+2601                     # ☁
+	S_corr: U+2591                      # LIGHT SHADE
+	S_engrcorr: U+2591                  # LIGHT SHADE
+	S_litcorr: U+2592                   # MEDIUM SHADE
 	S_vwall: U+2502                     # BOX DRAWINGS LIGHT VERTICAL
 	S_hwall: U+2500                     # BOX DRAWINGS LIGHT HORIZONTAL
 	S_tlcorn: U+250c                    # BOX DRAWINGS LIGHT DOWN AND RIGHT
@@ -826,8 +844,8 @@ start: Enhanced1
 	S_ndoor: U+00b7                     # MIDDLE DOT
 	S_vodoor: U+2592                    # MEDIUM SHADE
 	S_hodoor: U+2592                    # MEDIUM SHADE
-	S_bars: U+2551                      # ║
-	S_tree: U+2660                      # ♠
+	S_bars: U+2261                      # IDENTICAL TO
+	S_tree: U+03a8                      # GREEK CAPITAL LETTER PSI
 	S_room: U+00b7                      # MIDDLE DOT
 	S_engroom: U+03BE                   # Greek Small Letter Xi
 	S_darkroom: U+00b7                  # MIDDLE DOT
@@ -903,7 +921,7 @@ finish
 start: Enhanced2
 #       contributed in GitHub pull request 1503 by abcbarryn.
 #       This has double line symbols.
-	Description: Enhanced with Unicode glyphs and 24-bit color
+	Description: Enhanced with more Unicode glyphs and 24-bit color
 	Restrictions: primary
 	Handling: UTF8
 	S_corr: U+2591

From b051ce8fd9ba92d16aa87719b5a57e1035ab58f6 Mon Sep 17 00:00:00 2001
From: Patric Mueller <bhaak@gmx.net>
Date: Thu, 23 Apr 2026 16:08:36 +0200
Subject: [PATCH 17/18] Add Unicode glyphs to Enhanced1 symset comments

---
 dat/symbols | 178 ++++++++++++++++++++++++++--------------------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/dat/symbols b/dat/symbols
index 2ea87b681..d461d6f0a 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -827,95 +827,95 @@ start: Enhanced1
 	Description: Enhanced with Unicode glyphs and 24-bit color
 	Restrictions: primary
 	Handling: UTF8
-	S_corr: U+2591                      # LIGHT SHADE
-	S_engrcorr: U+2591                  # LIGHT SHADE
-	S_litcorr: U+2592                   # MEDIUM SHADE
-	S_vwall: U+2502                     # BOX DRAWINGS LIGHT VERTICAL
-	S_hwall: U+2500                     # BOX DRAWINGS LIGHT HORIZONTAL
-	S_tlcorn: U+250c                    # BOX DRAWINGS LIGHT DOWN AND RIGHT
-	S_trcorn: U+2510                    # BOX DRAWINGS LIGHT DOWN AND LEFT
-	S_blcorn: U+2514                    # BOX DRAWINGS LIGHT UP AND RIGHT
-	S_brcorn: U+2518                    # BOX DRAWINGS LIGHT UP AND LEFT
-	S_crwall: U+253c                    # BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-	S_tuwall: U+2534                    # BOX DRAWINGS LIGHT UP AND HORIZONTAL
-	S_tdwall: U+252c                    # BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-	S_tlwall: U+2524                    # BOX DRAWINGS LIGHT VERTICAL AND LEFT
-	S_trwall: U+251c                    # BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-	S_ndoor: U+00b7                     # MIDDLE DOT
-	S_vodoor: U+2592                    # MEDIUM SHADE
-	S_hodoor: U+2592                    # MEDIUM SHADE
-	S_bars: U+2261                      # IDENTICAL TO
-	S_tree: U+03a8                      # GREEK CAPITAL LETTER PSI
-	S_room: U+00b7                      # MIDDLE DOT
-	S_engroom: U+03BE                   # Greek Small Letter Xi
-	S_darkroom: U+00b7                  # MIDDLE DOT
-	S_upladder: U+2264                  # LESS-THAN OR EQUAL TO
-	S_dnladder: U+2265                  # GREATER-THAN OR EQUAL TO
-	S_altar: U+03A9                     # GREEK CAPITAL LETTER OMEGA
-	S_grave: U+2020                     # DAGGER
-	G_fountain: U+2320/0-150-255        # TOP HALF INTEGRAL
-	S_pool: U+224b                      # TRIPLE TILDE
-	S_ice: U+00b7                       # MIDDLE DOT
-	S_lava: U+224b                      # TRIPLE TILDE
-	S_lavawall: U+2248                  # ALMOST EQUAL TO
-	S_vodbridge: U+00b7                 # MIDDLE DOT
-	S_hodbridge: U+00b7                 # MIDDLE DOT
-	S_water: U+2248                     # ALMOST EQUAL TO
-	S_web: U+00A4                       # CURRENCY SIGN
-	S_vbeam: U+2502                     # BOX DRAWINGS LIGHT VERTICAL
-	S_hbeam: U+2500                     # BOX DRAWINGS LIGHT HORIZONTAL
-	S_sw_tc: U+2594                     # UPPER ONE EIGHTH BLOCK
-	S_sw_ml: U+258f                     # LEFT ONE EIGHTH BLOCK
-	S_sw_mr: U+2595                     # RIGHT ONE EIGHTH BLOCK
-	S_sw_bc: U+2581                     # LOWER ONE EIGHTH BLOCK
-	S_expl_tc: U+2594                   # UPPER ONE EIGHTH BLOCK
-	S_expl_ml: U+258f                   # LEFT ONE EIGHTH BLOCK
-	S_expl_mr: U+2595                   # RIGHT ONE EIGHTH BLOCK
-	S_expl_bc: U+2581                   # LOWER ONE EIGHTH BLOCK
-	G_vwall_sokoban:  U+2502/blue
-	G_hwall_sokoban:  U+2500/blue
-	G_tlcorn_sokoban: U+250c/blue
-	G_trcorn_sokoban: U+2510/blue
-	G_blcorn_sokoban: U+2514/blue
-	G_brcorn_sokoban: U+2518/blue
-	G_crwall_sokoban: U+253C/blue
-	G_tuwall_sokoban: U+2534/blue
-	G_tdwall_sokoban: U+252C/blue
-	G_tlwall_sokoban: U+2524/blue
-	G_trwall_sokoban: U+251C/blue
-	G_vwall_gehennom:  U+2502/red
-	G_hwall_gehennom:  U+2500/red
-	G_tlcorn_gehennom: U+250c/red
-	G_trcorn_gehennom: U+2510/red
-	G_blcorn_gehennom: U+2514/red
-	G_brcorn_gehennom: U+2518/red
-	G_crwall_gehennom: U+253C/red
-	G_tuwall_gehennom: U+2534/red
-	G_tdwall_gehennom: U+252C/red
-	G_tlwall_gehennom: U+2524/red
-	G_trwall_gehennom: U+251C/red
-	G_vwall_knox:  U+2502/150-75-0
-	G_hwall_knox:  U+2500/150-75-0
-	G_tlcorn_knox: U+250c/150-75-0
-	G_trcorn_knox: U+2510/150-75-0
-	G_blcorn_knox: U+2514/150-75-0
-	G_brcorn_knox: U+2518/150-75-0
-	G_crwall_knox: U+253C/150-75-0
-	G_tuwall_knox: U+2534/150-75-0
-	G_tdwall_knox: U+252C/150-75-0
-	G_tlwall_knox: U+2524/150-75-0
-	G_trwall_knox: U+251C/150-75-0
-	G_vwall_mines:  U+2502/113-126-142
-	G_hwall_mines:  U+2500/113-126-142
-	G_tlcorn_mines: U+250c/113-126-142
-	G_trcorn_mines: U+2510/113-126-142
-	G_blcorn_mines: U+2514/113-126-142
-	G_brcorn_mines: U+2518/113-126-142
-	G_crwall_mines: U+253C/113-126-142
-	G_tuwall_mines: U+2534/113-126-142
-	G_tdwall_mines: U+252C/113-126-142
-	G_tlwall_mines: U+2524/113-126-142
-	G_trwall_mines: U+251C/113-126-142
+	S_corr: U+2591                      # ░ LIGHT SHADE
+	S_engrcorr: U+2591                  # ░ LIGHT SHADE
+	S_litcorr: U+2592                   # ▒ MEDIUM SHADE
+	S_vwall: U+2502                     # │ BOX DRAWINGS LIGHT VERTICAL
+	S_hwall: U+2500                     # ─ BOX DRAWINGS LIGHT HORIZONTAL
+	S_tlcorn: U+250c                    # ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT
+	S_trcorn: U+2510                    # ┐ BOX DRAWINGS LIGHT DOWN AND LEFT
+	S_blcorn: U+2514                    # └ BOX DRAWINGS LIGHT UP AND RIGHT
+	S_brcorn: U+2518                    # ┘ BOX DRAWINGS LIGHT UP AND LEFT
+	S_crwall: U+253c                    # ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+	S_tuwall: U+2534                    # ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL
+	S_tdwall: U+252c                    # ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+	S_tlwall: U+2524                    # ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT
+	S_trwall: U+251c                    # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+	S_ndoor: U+00b7                     # · MIDDLE DOT
+	S_vodoor: U+2592                    # ▒ MEDIUM SHADE
+	S_hodoor: U+2592                    # ▒ MEDIUM SHADE
+	S_bars: U+2261                      # ≡ IDENTICAL TO
+	S_tree: U+03a8                      # Ψ GREEK CAPITAL LETTER PSI
+	S_room: U+00b7                      # · MIDDLE DOT
+	S_engroom: U+03BE                   # ξ Greek Small Letter Xi
+	S_darkroom: U+00b7                  # · MIDDLE DOT
+	S_upladder: U+2264                  # ≤ LESS-THAN OR EQUAL TO
+	S_dnladder: U+2265                  # ≥ GREATER-THAN OR EQUAL TO
+	S_altar: U+03A9                     # Ω GREEK CAPITAL LETTER OMEGA
+	S_grave: U+2020                     # † DAGGER
+	G_fountain: U+2320/0-150-255        # ⌠ TOP HALF INTEGRAL
+	S_pool: U+224b                      # ≋ TRIPLE TILDE
+	S_ice: U+00b7                       # · MIDDLE DOT
+	S_lava: U+224b                      # ≋ TRIPLE TILDE
+	S_lavawall: U+2248                  # ≈ ALMOST EQUAL TO
+	S_vodbridge: U+00b7                 # · MIDDLE DOT
+	S_hodbridge: U+00b7                 # · MIDDLE DOT
+	S_water: U+2248                     # ≈ ALMOST EQUAL TO
+	S_web: U+00A4                       # ¤ CURRENCY SIGN
+	S_vbeam: U+2502                     # │ BOX DRAWINGS LIGHT VERTICAL
+	S_hbeam: U+2500                     # ─ BOX DRAWINGS LIGHT HORIZONTAL
+	S_sw_tc: U+2594                     # ▔ UPPER ONE EIGHTH BLOCK
+	S_sw_ml: U+258f                     # ▏ LEFT ONE EIGHTH BLOCK
+	S_sw_mr: U+2595                     # ▕ RIGHT ONE EIGHTH BLOCK
+	S_sw_bc: U+2581                     #   LOWER ONE EIGHTH BLOCK
+	S_expl_tc: U+2594                   # ▔ UPPER ONE EIGHTH BLOCK
+	S_expl_ml: U+258f                   # ▏ LEFT ONE EIGHTH BLOCK
+	S_expl_mr: U+2595                   # ▕ RIGHT ONE EIGHTH BLOCK
+	S_expl_bc: U+2581                   #   LOWER ONE EIGHTH BLOCK
+	G_vwall_sokoban:  U+2502/blue       # │ BOX DRAWINGS LIGHT VERTICAL
+	G_hwall_sokoban:  U+2500/blue       # ─ BOX DRAWINGS LIGHT HORIZONTAL
+	G_tlcorn_sokoban: U+250c/blue       # ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT
+	G_trcorn_sokoban: U+2510/blue       # ┐ BOX DRAWINGS LIGHT DOWN AND LEFT
+	G_blcorn_sokoban: U+2514/blue       # └ BOX DRAWINGS LIGHT UP AND RIGHT
+	G_brcorn_sokoban: U+2518/blue       # ┘ BOX DRAWINGS LIGHT UP AND LEFT
+	G_crwall_sokoban: U+253C/blue       # ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+	G_tuwall_sokoban: U+2534/blue       # ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL
+	G_tdwall_sokoban: U+252C/blue       # ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+	G_tlwall_sokoban: U+2524/blue       # ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT
+	G_trwall_sokoban: U+251C/blue       # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+	G_vwall_gehennom:  U+2502/red       # │ BOX DRAWINGS LIGHT VERTICAL
+	G_hwall_gehennom:  U+2500/red       # ─ BOX DRAWINGS LIGHT HORIZONTAL
+	G_tlcorn_gehennom: U+250c/red       # ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT
+	G_trcorn_gehennom: U+2510/red       # ┐ BOX DRAWINGS LIGHT DOWN AND LEFT
+	G_blcorn_gehennom: U+2514/red       # └ BOX DRAWINGS LIGHT UP AND RIGHT
+	G_brcorn_gehennom: U+2518/red       # ┘ BOX DRAWINGS LIGHT UP AND LEFT
+	G_crwall_gehennom: U+253C/red       # ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+	G_tuwall_gehennom: U+2534/red       # ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL
+	G_tdwall_gehennom: U+252C/red       # ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+	G_tlwall_gehennom: U+2524/red       # ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT
+	G_trwall_gehennom: U+251C/red       # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+	G_vwall_knox:  U+2502/150-75-0      # │ BOX DRAWINGS LIGHT VERTICAL
+	G_hwall_knox:  U+2500/150-75-0      # ─ BOX DRAWINGS LIGHT HORIZONTAL
+	G_tlcorn_knox: U+250c/150-75-0      # ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT
+	G_trcorn_knox: U+2510/150-75-0      # ┐ BOX DRAWINGS LIGHT DOWN AND LEFT
+	G_blcorn_knox: U+2514/150-75-0      # └ BOX DRAWINGS LIGHT UP AND RIGHT
+	G_brcorn_knox: U+2518/150-75-0      # ┘ BOX DRAWINGS LIGHT UP AND LEFT
+	G_crwall_knox: U+253C/150-75-0      # ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+	G_tuwall_knox: U+2534/150-75-0      # ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL
+	G_tdwall_knox: U+252C/150-75-0      # ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+	G_tlwall_knox: U+2524/150-75-0      # ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT
+	G_trwall_knox: U+251C/150-75-0      # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+	G_vwall_mines:  U+2502/113-126-142  # │ BOX DRAWINGS LIGHT VERTICAL
+	G_hwall_mines:  U+2500/113-126-142  # ─ BOX DRAWINGS LIGHT HORIZONTAL
+	G_tlcorn_mines: U+250c/113-126-142  # ┌ BOX DRAWINGS LIGHT DOWN AND RIGHT
+	G_trcorn_mines: U+2510/113-126-142  # ┐ BOX DRAWINGS LIGHT DOWN AND LEFT
+	G_blcorn_mines: U+2514/113-126-142  # └ BOX DRAWINGS LIGHT UP AND RIGHT
+	G_brcorn_mines: U+2518/113-126-142  # ┘ BOX DRAWINGS LIGHT UP AND LEFT
+	G_crwall_mines: U+253C/113-126-142  # ┼ BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+	G_tuwall_mines: U+2534/113-126-142  # ┴ BOX DRAWINGS LIGHT UP AND HORIZONTAL
+	G_tdwall_mines: U+252C/113-126-142  # ┬ BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+	G_tlwall_mines: U+2524/113-126-142  # ┤ BOX DRAWINGS LIGHT VERTICAL AND LEFT
+	G_trwall_mines: U+251C/113-126-142  # ├ BOX DRAWINGS LIGHT VERTICAL AND RIGHT
 finish
 
 start: Enhanced2

From bad3e02246559d778da3c84f6c6f83e3d66ee04b Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Thu, 23 Apr 2026 17:31:20 -0400
Subject: [PATCH 18/18] follow-up comment bit

---
 dat/symbols | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dat/symbols b/dat/symbols
index d461d6f0a..6233c83f5 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -920,7 +920,7 @@ finish
 
 start: Enhanced2
 #       contributed in GitHub pull request 1503 by abcbarryn.
-#       This has double line symbols.
+#       This has double line wall symbols.
 	Description: Enhanced with more Unicode glyphs and 24-bit color
 	Restrictions: primary
 	Handling: UTF8