From d85b46d850eb5c40e6a70383a01a5505530012f2 Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Tue, 1 May 2018 15:57:05 +0100
Subject: [PATCH] XUNAME is a builtin in our Muddle.

This means the assembler function in TELL isn't needed. Rename the
colliding function in ROOMS, and use the builtin in CTELL's stub.

(We could get rid of the stub entirely.)
---
 src/cfs/ctell.2   | 4 ++--
 src/cfs/rooms.395 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cfs/ctell.2 b/src/cfs/ctell.2
index 3cdb9e8f..6aa88825 100644
--- a/src/cfs/ctell.2
+++ b/src/cfs/ctell.2
@@ -90,8 +90,8 @@ are never both set (no lowercase or a few other symbols)"
    <COND (<G=? .Y 75> <+ 1900 .Y>) (T <+ 2000 .Y>)>
 >
 
-<DEFINE GXUNAME () "MTRZORK">
-<SETG XUNM "MTRZORK">
+<SETG XUNM <XUNAME>>
+<DEFINE GXUNAME () ,XUNM>
 <SETG SCRIPT-CHANNEL <>>
 
 <DEFINE STARTER () 1>
diff --git a/src/cfs/rooms.395 b/src/cfs/rooms.395
index e040a813..5d9aff01 100644
--- a/src/cfs/rooms.395
+++ b/src/cfs/rooms.395
@@ -48,7 +48,7 @@
 		  if that device exists; if not, (sort of) returns directory save file
 		  came from.  On its it returns # zorkers currently in existence."
 	       <RANDOM <CHTYPE <DSKDATE> FIX>>
-	       <SETG XUNM <XUNAME>>
+	       <SETG XUNM <FROB-XUNAME>>
 	       <COND (<AND <L? .MUDDLE 100>
 			   <OR <=? ,XUNM "USERS1">
 			       <=? ,XUNM "USERS2">>>
@@ -118,7 +118,7 @@
 
 <OFF ,GC-HAND>
 
-<DEFINE XUNAME ()
+<DEFINE FROB-XUNAME ()
   #DECL ((VALUE) STRING)
   <MAPF ,STRING
 	<FUNCTION (X)