sync changes since last snapshot

win/X11/NetHack.ad

@@ -59,10 +59,10 @@ NetHack*message*translations:	<KeyPress>: input()
 ! It is not guaranteed that the window manager will honor the icon selection.
 !NetHack*icon: nh56
 !
-! If True, a popup for single character prompts such as y/n questions is _not_
-! used.
-!NetHack*slow: True
-!
+! If True, the default, a popup for single character prompts such as y/n
+! questions is _not_ used.
+NetHack*slow: True
+
 ! The number of lines the message window will show without scrolling.
 !NetHack*message_lines: 12
 !

win/X11/winX.c

@@ -902,7 +902,7 @@ static XtActionsRec actions[] = {
 
 static XtResource resources[] = {
     { "slow", "Slow", XtRBoolean, sizeof(Boolean),
-      XtOffset(AppResources *,slow), XtRString, "False" },
+      XtOffset(AppResources *,slow), XtRString, "True" },
     { "autofocus", "AutoFocus", XtRBoolean, sizeof(Boolean),
       XtOffset(AppResources *,autofocus), XtRString, "False" },
     { "message_line", "Message_line", XtRBoolean, sizeof(Boolean),

win/X11/wintext.c

@@ -471,7 +471,7 @@ calculate_rip_text(int how)
 #ifndef GOLDOBJ
 		u.ugold);
 #else
-		money_cnt(invent));
+		done_money);
 #endif
 	/* Put together death description */
 	switch (killer_format) {