Merge branch 'NetHack-3.6'

dat/tribute

@@ -1,4 +1,4 @@
-# NetHack 3.6  tribute       $NHDT-Date: 1573777025 2019/11/15 00:17:05 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.84 $
+# NetHack 3.6  tribute       $NHDT-Date: 1574107001 2019/11/18 19:56:41 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.86 $
 # Copyright (c) 2017 by Robert Patrick Rankin
 # NetHack may be freely redistributed.  See license for details.
 # A tribute introduced in NetHack 3.6.0 to:
@@ -549,7 +549,7 @@ explain the observed facts, and they are completely and utterly wrong.
 %e passage
 # p. 205
 %passage 11
-"Where to they all come from?" said Twoflower, as they fled yet another mob.
+"Where do they all come from?" said Twoflower, as they fled yet another mob.
 
 "Inside every sane person there's a madman struggling to get out," said the
 shopkeeper,  "That's what I've always thought.  No one goes mad quicker than
@@ -786,7 +786,7 @@ back of his skull.
 
   [Equal Rites, by Terry Pratchett]
 %e passage
-# p. 185 (actually uses four periods to mark a sentence ending in a ellipsis)
+# p. 185 (actually uses four periods to mark a sentence ending in an ellipsis)
 %passage 10
 There may be universes where librarianship is considered a peaceful sort of
 occupation, and where the risks are limited to large volumes falling off
@@ -2004,7 +2004,7 @@ road to Hell, and demons were, after all, traditionalists.
 %e passage
 # pp. 9-10 (passage has an interesting start but not much of a finish...)
 %passage 3
-"It's a haunting," he ventured.  "Some short of ghost, maybe.  A bell, book
+"It's a haunting," he ventured.  "Some sort of ghost, maybe.  A bell, book
 and candle job."
 
 The Bursar sighed.  "We tried that, Archchancellor."
@@ -2816,8 +2816,8 @@ It carried on turning, pulling her with it.
 
 Blimey.  Oh, well...
 
-Then she did was neither Granny Weatherwax nor Magrat would have dreamed of
+Then she did what neither Granny Weatherwax nor Magrat would have dreamed
-doing in the circumstances.  But Nanny Ogg's voyages on the sea of
+of doing in the circumstances.  But Nanny Ogg's voyages on the sea of
 intersexual dalliance had gone rather further than twice around the
 lighthouse, and she saw nothing demeaning in getting a man to help her.
 

doc/fixes36.3

@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.181 $ $NHDT-Date: 1573943506 2019/11/16 22:31:46 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.184 $ $NHDT-Date: 1574107001 2019/11/18 19:56:41 $
 
 This fixes36.3 file is here to capture information about updates in the 3.6.x
 lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -116,7 +116,10 @@ when a boulder was teleported, if it landed in a pit or trap door or hole its
 	former location wasn't updated to show that it wasn't there anymore
 	(noticed in Sokoban but not limited to there)
 Terry Pratchett tribute, fix typo in passage #4 for Mort ("the" -> "they");
-	also passage #7 for Soul Music ("genious" -> "genius")
+	also passage #7 for Soul Music ("genious" -> "genius");
+	and passage #11 for The Light Fantastic ("to" -> "do");
+	passage #3 for Eric ("short" -> "sort");
+	passage #10 for Witches Abroad ("was" -> "what")
 fix typo in end_of_input() present since 3.6.0 that would prevent compilation
 	for NOSAVEONHANGUP+INSURANCE configuration
 when a status condition becomes fatal, keep it listed as an active condition

src/files.c

@@ -4360,6 +4360,14 @@ reveal_paths(VOID_ARGS)
 #ifdef DLB
     raw_printf("Basic data files%s are collected inside:", buf);
     filep = DLBFILE;
+#ifdef VERSION_IN_DLB_FILENAME
+    Strcpy(buf, build_dlb_filename((const char *) 0));
+#ifdef PREFIXES_IN_USE
+    fqn = fqname(buf, DATAPREFIX, 1);
+    if (fqn)
+        filep = fqn;
+#endif /* PREFIXES_IN_USE */
+#endif
     raw_printf("    \"%s\"", filep);
 #ifdef DLBFILE2
     filep = DLBFILE2;
@@ -4369,6 +4377,27 @@ reveal_paths(VOID_ARGS)
     raw_printf("Basic data files%s are in many separate files.", buf);
 #endif /* ?DLB */
 
+    /* dumplog */
+
+#ifdef DUMPLOG
+#ifdef SYSCF
+    fqn = sysopt.dumplogfile;
+#else  /* !SYSCF */
+#ifdef DUMPLOG_FILE
+    fqn = DUMPLOG_FILE;
+#else
+    fqn = (char *) 0;
+#endif
+#endif /* ?SYSCF */
+    if (fqn) {
+        raw_print("Your end-of-game dump 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.");
+
     /* personal configuration file */
 
     buf[0] = '\0';
@@ -4421,25 +4450,6 @@ reveal_paths(VOID_ARGS)
     raw_printf("    \"%s\"", fqn ? fqn : default_configfile);
 #endif  /* ?UNIX */
 
-#ifdef DUMPLOG
-#ifdef SYSCF
-    fqn = sysopt.dumplogfile;
-#else  /* !SYSCF */
-#ifdef DUMPLOG_FILE
-    fqn = DUMPLOG_FILE;
-#else
-    fqn = (char *) 0;
-#endif
-#endif /* ?SYSCF */
-    if (fqn) {
-        raw_print("Your end-of-game dump 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.");
-
     raw_print("");
 }
 

src/objnam.c

@@ -2445,8 +2445,11 @@ const char *oldstr;
     if (index("zxs", lo_c)
         || (len >= 2 && lo_c == 'h' && index("cs", lowc(*(spot - 1)))
             /* 21st century k-sound */
-            && !(len >= 4 && !strcmpi(spot - 2, "ech")
+            && !(len >= 4 &&
-                && index("tm", lowc(*(spot - 4)))))
+                 ((lowc(*(spot - 2)) == 'e'
+                    && index("mt", lowc(*(spot - 3)))) ||
+                  (lowc(*(spot - 2)) == 'o'
+                    && index("lp", lowc(*(spot - 3)))))))
         /* Kludge to get "tomatoes" and "potatoes" right */
         || (len >= 4 && !strcmpi(spot - 2, "ato"))
         || (len >= 5 && !strcmpi(spot - 4, "dingo"))) {