Merge branch 'NetHack-3.7' into copperwater-hallutraps-3.7

diff --cc doc/fixes37.0
Simple merge

diff --cc include/extern.h
Simple merge

diff --cc src/apply.c
Simple merge

diff --cc src/cmd.c
Simple merge

diff --cc src/detect.c
Simple merge

diff --cc src/dig.c
Simple merge

diff --cc src/display.c
Simple merge

diff --cc src/dothrow.c
Simple merge

diff --cc src/hack.c
Simple merge

diff --cc src/invent.c
Simple merge

diff --cc src/objnam.c
Simple merge

diff --cc src/pager.c
Simple merge

diff --cc src/steed.c
Simple merge

diff --cc src/trap.c
index 59eee97bb04866e5e774e821ec099834f10976fa,0c8936fa3a44d9cbabee33b9787b3e826eeaad86..2b6633e94e1ced9af249532fe00c7ba8a572c9ff
--- 1/src/trap.c
--- 2/src/trap.c
+++ b/src/trap.c
@@@ -1280,10 -1290,10 +1290,10 @@@ unsigned trflags
          if (!Can_fall_thru(&u.uz)) {
              seetrap(trap); /* normally done in fall_through */
              impossible("dotrap: %ss cannot exist on this level.",
 -                       defsyms[trap_to_defsym(ttype)].explanation);
 +                       trapname(ttype, TRUE));
              break; /* don't activate it after all */
          }
-         fall_through(TRUE);
+         fall_through(TRUE, (trflags & TOOKPLUNGE));
          break;
  
      case TELEP_TRAP: