--- a/layout.c	Mon May 21 14:37:26 2007 +0200
+++ b/layout.c	Tue May 22 11:29:04 2007 +0200
@@ -198,11 +198,9 @@
 	int i;
 
 	if(!arg) {
-		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-		if(i == nlayouts - 1)
-			lt = &layout[0];
-		else
-			lt = &layout[++i];
+		lt++;
+		if(lt == layout + nlayouts)
+			lt = layout;
 	}
 	else {
 		i = atoi(arg);