Merge branch 'master' into derek-farming

Reverse merge before final reintegration.

* master: (40 commits)
  Fix magic mapped dark room symbols
  Disclose extinct species alongside genocided ones
  ...

Conflicts:
	doc/fixes35.0
	src/do.c
	src/files.c
	src/invent.c
	src/objnam.c
	sys/share/pcmain.c

sys/share/NetHack.cnf

@@ -121,3 +121,14 @@ OPTIONS=time,noshowexp,number_pad:2,lit_corridor
 # DEC Rainbows will hang if rawio is set, so they should instead use:
 #OPTIONS=BIOS,DECgraphics
 
+# Colored menus.
+#OPTIONS=menucolors
+# Syntax is: MENUCOLOR="string_to_match"=color&attribute
+#  Colors: black, red, green, brown, blue, magenta, cyan, gray, orange,
+#          lightgreen, yellow, lightblue, lightmagenta, lightcyan, white.
+#  Attributes: none, bold, dim, underline, blink, inverse.
+#MENUCOLOR=" blessed "=green
+#MENUCOLOR=" holy "=green
+#MENUCOLOR=" cursed "=red
+#MENUCOLOR=" unholy "=red
+#MENUCOLOR=" cursed .* (being worn)"=orange&underline

sys/share/pcmain.c

@@ -432,7 +432,7 @@ char *argv[];
         hackpid = 1;
 #endif
         write(fd, (genericptr_t) &hackpid, sizeof(hackpid));
-        close(fd);
+		nhclose(fd);
     }
 #ifdef MFLOPPY
     level_info[0].where = ACTIVE;

sys/share/pcsys.c

@@ -282,7 +282,7 @@ int start;
 	if (sysflags.asksavedisk) {
 		/* Don't prompt if you can find the save file */
 		if ((fd = open_savefile()) >= 0) {
-			(void) close(fd);
+			(void) nhclose(fd);
 			return 1;
 		}
 		clear_nhwindow(WIN_MESSAGE);
@@ -335,7 +335,7 @@ comspec_exists()
 
 	if ((comspec = getcomspec()))
 		if ((fd = open(comspec, O_RDONLY)) >= 0) {
-			(void) close(fd);
+			(void) nhclose(fd);
 			return TRUE;
 		}
 	return FALSE;

sys/share/pcunix.c

@@ -150,7 +150,7 @@ getlock()
 		error("Cannot open %s", fq_lock);
 	}
 
-	(void) close(fd);
+	(void) nhclose(fd);
 
 	if(iflags.window_inited) { 
 # ifdef SELF_RECOVER
@@ -248,7 +248,7 @@ gotlock:
 # endif
 			error("cannot write lock (%s)", fq_lock);
 		}
-		if(close(fd) == -1) {
+		if(nhclose(fd) == -1) {
 # if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
 			chdirx(orgdir, 0);
 # endif

sys/unix/Makefile.top

@@ -79,7 +79,7 @@ VARDAT = $(VARDATD) $(VARDATND)
 
 DATHELP = help hh cmdhelp history opthelp wizhelp
 
-SPEC_LEVS = asmodeus.lev baalz.lev bigrm-?.lev castle.lev fakewiz?.lev \
+SPEC_LEVS = asmodeus.lev baalz.lev bigrm-*.lev castle.lev fakewiz?.lev \
 	juiblex.lev knox.lev medusa-?.lev minend-?.lev minefill.lev \
 	minetn-?.lev oracle.lev orcus.lev sanctum.lev soko?-?.lev \
 	tower?.lev valley.lev wizard?.lev \