Index: ChangeLog
===================================================================
diff -u -r978da25757f0f71703de9bdbd3d414eb63e774f2 -r18224c233ce4ea3e989f3c754d8bf097b400f94d
--- ChangeLog	(.../ChangeLog)	(revision 978da25757f0f71703de9bdbd3d414eb63e774f2)
+++ ChangeLog	(.../ChangeLog)	(revision 18224c233ce4ea3e989f3c754d8bf097b400f94d)
@@ -1,3 +1,6 @@
+2011-08-07 <Gustaf.Neumann@wu-wien.ac.at>
+	* backport of autoname fix from nsf
+	
 2011-04-28 <Gustaf.Neumann@wu-wien.ac.at>
 	* serializer: fix allChildren to handle names with semicolons
 	* serializer: fix allInstances to handle names with semicolons
Index: generic/xotcl.c
===================================================================
diff -u -r5fae57ab03ce52f7e2e5b3bc954eb6b97c3f33d1 -r18224c233ce4ea3e989f3c754d8bf097b400f94d
--- generic/xotcl.c	(.../xotcl.c)	(revision 5fae57ab03ce52f7e2e5b3bc954eb6b97c3f33d1)
+++ generic/xotcl.c	(.../xotcl.c)	(revision 18224c233ce4ea3e989f3c754d8bf097b400f94d)
@@ -2258,9 +2258,9 @@
       valueObject = Tcl_DuplicateObj(valueObject);
     }
     Tcl_SetLongObj(valueObject, autoname_counter);
+    Tcl_ObjSetVar2(interp, XOTclGlobalObjects[XOTE_AUTONAMES], name, 
+		   valueObject, flgs);
   }
-  Tcl_ObjSetVar2(interp, XOTclGlobalObjects[XOTE_AUTONAMES], name, 
-                 valueObject, flgs);
   
   if (resetOpt) {
     if (valueObject) { /* we have an entry */
Index: tests/testx.xotcl
===================================================================
diff -u -ra976b7c6a116f584114d2612494aaaa8e8028387 -r18224c233ce4ea3e989f3c754d8bf097b400f94d
--- tests/testx.xotcl	(.../testx.xotcl)	(revision a976b7c6a116f584114d2612494aaaa8e8028387)
+++ tests/testx.xotcl	(.../testx.xotcl)	(revision 18224c233ce4ea3e989f3c754d8bf097b400f94d)
@@ -1,4 +1,4 @@
-#$Id: testx.xotcl,v 1.36 2007/10/12 19:53:32 neumann Exp $
+# -*- Tcl -*-
 package require XOTcl 1
 namespace import -force xotcl::*
 
@@ -1646,6 +1646,9 @@
     i4 mixin {MovementTest MovementLog}
     
     i4 proc aaa args {puts TEST}
+
+    ::errorCheck [i4 info precedence]      "::MovementLog ::MovementTest ::InteractiveAgent3 ::Agent ::xotcl::Object" "precedence i4"
+
     ::errorCheck [i4 procsearch moveAgent]-[i4 procsearch aaa]-[i4 procsearch set] "::MovementLog instproc moveAgent-::i4 proc aaa-::xotcl::Object instcmd set" "procsearch"
 
     Class create A