Index: generic/tclHash.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclHash.c,v
retrieving revision 1.12
diff -u -p -r1.12 tclHash.c
--- generic/tclHash.c	12 Nov 2002 02:23:18 -0000	1.12
+++ generic/tclHash.c	9 Nov 2004 19:12:16 -0000
@@ -316,6 +316,7 @@ Tcl_FindHashEntry(tablePtr, key)
      */
 
     if (typePtr->compareKeysProc) {
+	Tcl_CompareHashKeysProc *compareKeysProc = typePtr->compareKeysProc;
 	for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
 	        hPtr = hPtr->nextPtr) {
 #if TCL_HASH_KEY_STORE_HASH
@@ -323,7 +324,7 @@ Tcl_FindHashEntry(tablePtr, key)
 		continue;
 	    }
 #endif
-	    if (typePtr->compareKeysProc ((VOID *) key, hPtr)) {
+	    if (compareKeysProc ((VOID *) key, hPtr)) {
 		return hPtr;
 	    }
 	}
@@ -414,6 +415,7 @@ Tcl_CreateHashEntry(tablePtr, key, newPt
      */
 
     if (typePtr->compareKeysProc) {
+	Tcl_CompareHashKeysProc *compareKeysProc = typePtr->compareKeysProc;
 	for (hPtr = tablePtr->buckets[index]; hPtr != NULL;
 	        hPtr = hPtr->nextPtr) {
 #if TCL_HASH_KEY_STORE_HASH
@@ -421,7 +423,7 @@ Tcl_CreateHashEntry(tablePtr, key, newPt
 		continue;
 	    }
 #endif
-	    if (typePtr->compareKeysProc ((VOID *) key, hPtr)) {
+	    if (compareKeysProc ((VOID *) key, hPtr)) {
 		*newPtr = 0;
 		return hPtr;
 	    }
@@ -703,13 +705,14 @@ Tcl_NextHashEntry(searchPtr)
 					 * Tcl_FirstHashEntry. */
 {
     Tcl_HashEntry *hPtr;
+    Tcl_HashTable *tablePtr = searchPtr->tablePtr;
 
     while (searchPtr->nextEntryPtr == NULL) {
-	if (searchPtr->nextIndex >= searchPtr->tablePtr->numBuckets) {
+	if (searchPtr->nextIndex >= tablePtr->numBuckets) {
 	    return NULL;
 	}
 	searchPtr->nextEntryPtr =
-		searchPtr->tablePtr->buckets[searchPtr->nextIndex];
+		tablePtr->buckets[searchPtr->nextIndex];
 	searchPtr->nextIndex++;
     }
     hPtr = searchPtr->nextEntryPtr;
Index: generic/tclListObj.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclListObj.c,v
retrieving revision 1.13
diff -u -p -r1.13 tclListObj.c
--- generic/tclListObj.c	7 Jan 2002 23:09:13 -0000	1.13
+++ generic/tclListObj.c	9 Nov 2004 19:12:16 -0000
@@ -680,17 +680,9 @@ Tcl_ListObjReplace(interp, listPtr, firs
 	if ((numAfterLast > 0) && (shift != 0)) {
 	    Tcl_Obj **src, **dst;
 
-	    if (shift < 0) {
-		for (src = elemPtrs + start, dst = src + shift;
-			numAfterLast > 0; numAfterLast--, src++, dst++) {
-		    *dst = *src;
-		}
-	    } else {
-		for (src = elemPtrs + numElems - 1, dst = src + shift;
-			numAfterLast > 0; numAfterLast--, src--, dst--) {
-		    *dst = *src;
-		}
-	    }
+	    src = elemPtrs + start; dst = src + shift;
+	    memmove((VOID*) dst, (VOID*) src, 
+	            (size_t) (numAfterLast * sizeof(Tcl_Obj*)));
 	}
 
 	/*
