--- a/window.c	Sun Nov 14 01:50:15 2004 +0000
+++ b/window.c	Sun Nov 14 08:11:05 2004 +0000
@@ -253,6 +253,7 @@
 Window *BringWindowToFront(Window *w)
 {
 	Window *v;
+	Window temp;
 
 	v = _last_window;
 	do {
@@ -265,14 +266,13 @@
 
 	assert(w < v);
 
-	do {
-		memswap(w, w+1, sizeof(Window));
-		w++;
-	} while (v != w);
+	temp = *w;
+	memmove(w, w + 1, (v - w) * sizeof(Window));
+	*v = temp;
 
-	SetWindowDirty(w);
+	SetWindowDirty(v);
 
-	return w;
+	return v;
 }
 
 Window *AllocateWindow(