Index: ChangeLog
===================================================================
RCS file: /cvsroot/tcl/tcl/ChangeLog,v
retrieving revision 1.1453.2.347
diff -u -r1.1453.2.347 ChangeLog
--- ChangeLog	30 Oct 2004 03:16:12 -0000	1.1453.2.347
+++ ChangeLog	30 Oct 2004 20:20:06 -0000
@@ -1,3 +1,9 @@
+2004-10-30  Miguel Sofer <msofer@users.sf.net>
+
+	* generic/tclInterp.c (TclPreventAliasLoop): fix for [Bug 1026493]
+	(*not* a backport of the fix for [Bug 707104], which fixes this
+	but changes alias behaviour).
+
 2004-10-29  Don Porter  <dgp@users.sourceforge.net>
 
         * library/tcltest/tcltest.tcl:  Correct reaction to errors in the
Index: generic/tclInterp.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInterp.c,v
retrieving revision 1.20.2.2
diff -u -r1.20.2.2 tclInterp.c
--- generic/tclInterp.c	12 May 2003 22:35:40 -0000	1.20.2.2
+++ generic/tclInterp.c	30 Oct 2004 20:20:07 -0000
@@ -1099,7 +1099,7 @@
 
 	    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
 		    "cannot define or rename alias \"",
-		    Tcl_GetString(aliasPtr->namePtr),
+		    Tcl_GetCommandName(cmdInterp, cmd),
 		    "\": interpreter deleted", (char *) NULL);
 	    return TCL_ERROR;
 	}
@@ -1115,7 +1115,7 @@
         if (aliasCmdPtr == cmdPtr) {
             Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
 		    "cannot define or rename alias \"",
-		    Tcl_GetString(aliasPtr->namePtr),
+		    Tcl_GetCommandName(cmdInterp, cmd),
 		    "\": would create a loop", (char *) NULL);
             return TCL_ERROR;
         }
