Merge branch 'naming-overflow-fix2' into NetHack-3.7

diff --cc doc/fixes3-7-0.txt
index 81cc64d3e7f590967045ce4628f2530480ac1b19,73aa30191dcefb63a97b1b1c123088cc32b8e10a..e3f6c51070c8ecd185dd7e80f98c2955426c1c95
--- 1/doc/fixes3-7-0.txt
--- 2/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@@ -1101,15 -1101,8 +1101,17 @@@ eating garlic makes nearby monsters fle
  giants occasionally get a battle axe or a two-handed sword
  give gremlin the property it stole, if possible
  'F'orcefighting with a war hammer has a small chance of breaking iron bars
+ player assigned name for monsters, specific objects, or object types could be
+       longer than what was intented to be allowed; for 'curses', much longer
 +very rarely random items are generated eroded, erodeproof, or greased
 +Nazgul can see invisible
 +fix a case where punished iron ball yanked hero on top of a monster
 +slightly randomize amount of items and monsters in the mines
 +dying in a wall spot (temporary gap or via Passes_walls) shared by two shops
 +      could result in "place_object: \"<item>\" [0] off map <0,0>" warnings
 +a monster capable of using a polymorph trap to deliberately change form could
 +      do so when trapped in an adjacent web or pit; if that happened, the
 +      monster remained flagged as 'trapped' and wouldn't be able to move
  
  
  Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --cc src/do_name.c
Simple merge

diff --cc src/invent.c
Simple merge

diff --cc src/objnam.c
Simple merge