Merge branch 'NetHack-3.6'

diff --cc src/invent.c
Simple merge

diff --cc src/mkobj.c
Simple merge

diff --cc src/objnam.c
index 30ddb87bbb8e63546e129a0a2f678d490e1714ef,e8bb71c14f266add0a3aab47003d3ba15fa4494c..f2ebbcfb049ce2a0b93e56c4d0d3115088ddb225
--- 1/src/objnam.c
--- 2/src/objnam.c
+++ b/src/objnam.c
@@@ -1203,8 -1208,10 +1203,10 @@@ unsigned doname_flags
          }
      }
      /* treat 'restoring' like suppress_price because shopkeeper and
-        bill might not be available yet while restore is in progress */
+        bill might not be available yet while restore is in progress
+        (objects won't normally be formatted during that time, but if
+        'perm_invent' is enabled then they might be) */
 -    if (iflags.suppress_price || restoring) {
 +    if (iflags.suppress_price || g.restoring) {
          ; /* don't attempt to obtain any stop pricing, even if 'with_price' */
      } else if (is_unpaid(obj)) { /* in inventory or in container in invent */
          long quotedprice = unpaid_cost(obj, TRUE);

diff --cc src/shk.c
Simple merge

diff --cc win/curses/cursinit.c
Simple merge

diff --cc win/curses/cursmain.c
Simple merge

diff --cc win/curses/cursmesg.c
Simple merge

diff --cc win/curses/curswins.c
Simple merge