U1231 - messages ordering when displacing a pet into a trap

move the message so it's before the mintrap test.  newsym's are needed
to ensure the display is correct if a --More-- prompt results.  I left the
"frighten" message alone, except for tense.  As per Pat's suggestion, I
changed the wording to future-proof the message.

doc/fixes35.0

@@ -73,6 +73,8 @@ reviving invisible troll could appear visible until it moves
 adjust some of the shop repair messages
 charge for reviving a shop owned corpse or reanimating a shop owned statue
 filled trap doors on castle can be re-dug
+message order when swapping places with a pet (e.g. into a trap), also use
+	different term instead of "displace"
 
 
 Platform- and/or Interface-Specific Fixes

src/hack.c

@@ -1380,12 +1380,15 @@ domove()
 		mtmp->mtrapped = 0;
 		remove_monster(x, y);
 		place_monster(mtmp, u.ux0, u.uy0);
+		newsym(x, y);
+		newsym(u.ux0, u.uy0);
+
+		You("%s %s.", mtmp->mtame ? "swap places with" : "frighten",
+		    pnambuf);
 
 		/* check for displacing it into pools and traps */
 		switch (minliquid(mtmp) ? 2 : mintrap(mtmp)) {
 		case 0:
-		    You("%s %s.", mtmp->mtame ? "displaced" : "frightened",
-			pnambuf);
 		    break;
 		case 1:		/* trapped */
 		case 3:		/* changed levels */