From a763b99afd5f5ea3ece99bbcc8b38e6914dcc2e1 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 18 Nov 2019 16:56:52 -0500
Subject: [PATCH 1/3] catch up on some post-beta1 corrections

---
 doc/fixes36.3 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 02d19b96a..500f079a7 100644
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -286,6 +286,16 @@ tty: revert the attempt to fix "message line anomaly: if autodecribe feedback
 	prompts that spanned more than one line, a more significant issue
 
 
+Fixes post-beta1
+------------------------------------------------------------------
+fix several tribute typos
+pluralization correction for unlikely epoch and loch
+ensure that --showpaths displays the personal confuration file last
+unix: Fix double DLB definition in linux hints file
+windows: fix --showpaths output for the data file which relies on being
+	constructed programmatically to incorporate the version suffix
+
+
 Platform- and/or Interface-Specific Fixes or Features
 -----------------------------------------------------
 EDIT_GETLIN: wizard mode 'monpolycontrol' was using the getlin() answer buffer

From 22180fc523c92353ab01e0d715823b6db3efc42a Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Mon, 18 Nov 2019 16:58:43 -0500
Subject: [PATCH 2/3] typo in fixes36.3

---
 doc/fixes36.3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 500f079a7..07a97fe56 100644
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -290,7 +290,7 @@ Fixes post-beta1
 ------------------------------------------------------------------
 fix several tribute typos
 pluralization correction for unlikely epoch and loch
-ensure that --showpaths displays the personal confuration file last
+ensure that --showpaths displays the personal configuration file last
 unix: Fix double DLB definition in linux hints file
 windows: fix --showpaths output for the data file which relies on being
 	constructed programmatically to incorporate the version suffix

From fc2886efb4df88630e61782c46aca4ca3aa6b7ec Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Mon, 18 Nov 2019 14:28:25 -0800
Subject: [PATCH 3/3] yet more --showpaths (dumplog)

Provide a little more information when dumplog is unavailable.
While testing various permutations, I encountered a couple of
problems with conditionally declared variables.
---
 src/files.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/files.c b/src/files.c
index 61612e20f..5f24956b8 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	files.c	$NHDT-Date: 1574037901 2019/11/18 00:45:01 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.270 $ */
+/* NetHack 3.6	files.c	$NHDT-Date: 1574116097 2019/11/18 22:28:17 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.272 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Derek S. Ray, 2015. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -4003,10 +4003,13 @@ boolean wildcards;
 void
 reveal_paths(VOID_ARGS)
 {
-    const char *fqn, *gamename = (hname && *hname) ? hname : "NetHack";
+    const char *fqn, *nodumpreason;
     char buf[BUFSZ];
-#if defined(SYSCF) || !defined(UNIX)
+#if defined(SYSCF) || !defined(UNIX) || defined(DLB)
     const char *filep;
+#ifdef SYSCF
+    const char *gamename = (hname && *hname) ? hname : "NetHack";
+#endif
 #endif
 #ifdef UNIX
     char *endp, *envp, cwdbuf[PATH_MAX];
@@ -4116,7 +4119,10 @@ reveal_paths(VOID_ARGS)
 
     /* dumplog */
 
-#ifdef DUMPLOG
+#ifndef DUMPLOG
+    nodumpreason = "not supported";
+#else
+    nodumpreason = "disabled";
 #ifdef SYSCF
     fqn = sysopt.dumplogfile;
 #else  /* !SYSCF */
@@ -4126,14 +4132,14 @@ reveal_paths(VOID_ARGS)
     fqn = (char *) 0;
 #endif
 #endif /* ?SYSCF */
-    if (fqn) {
-        raw_print("Your end-of-game dump file:");
+    if (fqn && *fqn) {
+        raw_print("Your end-of-game disclosure file:");
         (void) dump_fmtstr(fqn, buf, FALSE);
         buf[sizeof buf - sizeof "    \"\""] = '\0';
         raw_printf("    \"%s\"", buf);
     } else
-#endif /* DUMPLOG */
-        raw_print("No end-of-game dump file.");
+#endif /* ?DUMPLOG */
+        raw_printf("No end-of-game disclosure file (%s).", nodumpreason);
 
     /* personal configuration file */