Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01

doc/fixes36.2

@@ -127,6 +127,7 @@ cancelled shapeshifter is no longer able to change shape
 cancelled shapeshifter hit by polymorph magic will become uncancelled
 polymorph zap which creates a new long worm (or retains an old one via wizard
 	mode monpolycontrol) can hit that worm multiple times (tail segments)
+wishing for "orange" could yield orange or orange colored gem/potion/spellbook
 
 
 Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository

src/objnam.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	objnam.c	$NHDT-Date: 1533352036 2018/08/04 03:07:16 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.206 $ */
+/* NetHack 3.6	objnam.c	$NHDT-Date: 1537313446 2018/09/18 23:30:46 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.208 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2011. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -3204,6 +3204,11 @@ struct obj *no_wish;
         typ = SPE_BLANK_PAPER;
         goto typfnd;
     }
+    /* specific food rather than color of gem/potion/spellbook[/scales] */
+    if (!BSTRCMPI(bp, p - 6, "orange") && mntmp == NON_PM) {
+        typ = ORANGE;
+        goto typfnd;
+    }
     /*
      * NOTE: Gold pieces are handled as objects nowadays, and therefore
      * this section should probably be reconsidered as well as the entire