From: nhmall <nhmall@nethack.org>
Date: Sat, 18 May 2019 20:30:43 +0000 (-0400)
Subject: Merge branch 'NetHack-3.6'
X-Git-Tag: NetHack-3.7.0_WIP~411
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e972874b211fae2631f0b9592b5a6de8be05ebe;p=nethack

Merge branch 'NetHack-3.6'
---

8e972874b211fae2631f0b9592b5a6de8be05ebe
diff --cc src/objnam.c
index 30ddb87bb,e8bb71c14..f2ebbcfb0
--- a/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);