--- xtest/xts5/tset/Xlib13/stpntrmppn/stpntrmppn.m	2006-07-24 23:16:43.000000000 -0400
+++ xtest/xts5/tset/Xlib13/stpntrmppn/stpntrmppn.m.new	2006-07-26 18:08:21.000000000 -0400
@@ -107,9 +107,6 @@
 int 	nmap;
 >>EXTERN
 
-/* Maximum button number allowed. */
-#define	MAXBUTTON	5
-
 /*
  * MAPSIZE must be at least one greater than the maximum number of buttons
  * allowed.  We use a much larger value.
@@ -194,7 +191,7 @@
 	 */
 	for (i = 0; i < numbuttons; i++) {
 		map[i] = map[i] + 1;
-		if (map[i] > MAXBUTTON)
+		if (map[i] > numbuttons)
 			map[i] = 1;
 	}
 
@@ -270,7 +267,7 @@
   Report untested.
 >>CODE
 int	i;
-unsigned char zmap[5];
+unsigned char zmap[MAPSIZE];
 Window	win;
 
 	if (noext(numbuttons))
@@ -278,8 +275,8 @@
 	else
 		CHECK;
 
-	if (numbuttons<1 || numbuttons>5) {
-		report("Protocol limit of 1..5 buttons exceeded (%d).", numbuttons);
+	if (numbuttons<1 || numbuttons>MAPSIZE) {
+		report("Limit of 1..%d buttons exceeded (%d).", MAPSIZE, numbuttons);
 		return;
 	} else
 		CHECK;
@@ -375,8 +372,8 @@
 	else
 		CHECK;
 
-	if (numbuttons<1 || numbuttons>5) {
-		delete("Protocol limit of 1..5 buttons exceeded (%d).", numbuttons);
+	if (numbuttons<1 || numbuttons>MAPSIZE) {
+		delete("Limit of 1..%d buttons exceeded (%d).", MAPSIZE, numbuttons);
 		return;
 	} else
 		CHECK;
--- xtest/xts5/tset/Xlib13/gtpntrmppn/gtpntrmppn.m	2006-06-19 18:39:46.000000000 -0400
+++ xtest/xts5/tset/Xlib13/gtpntrmppn/gtpntrmppn.m.new	2006-07-26 18:02:43.000000000 -0400
@@ -106,11 +106,7 @@
 int 	nmap = MAPSIZE;
 >>EXTERN
 
-/*
- * The number of buttons should be between 1 and 5 -- allow more space
- * in the array than this.
- */
-#define	MAPSIZE	20
+#define	MAPSIZE	32
 static	unsigned char	Map[MAPSIZE];
 
 >>ASSERTION Good B 3
@@ -192,9 +188,9 @@
 returns the number of physical buttons actually on the pointer.
 >>STRATEGY
 Call xname to get number of buttons.
-Check this lies within the protocol limit of 1..5.
+Check this lies within the limit.
 If extension available:
-  Simulate the pressing of buttons 1..5 and check that
+  Simulate the pressing of buttons 1..n and check that
     we got Success for buttons in the range returned by xname, and
     we got BadValue for the rest.
   Release all buttons.
@@ -203,8 +199,8 @@
 int	i;
 
 	nbuttons = XCALL;
-	if (nbuttons < 1 || nbuttons > 5) {
-		report("Protocol limit of 1..5 buttons exceeded (%d).", nbuttons);
+	if (nbuttons < 1 || nbuttons > MAPSIZE) {
+		report("Limit of 1..%d buttons exceeded (%d).", MAPSIZE, nbuttons);
 		FAIL;
 	} else
 		CHECK;
@@ -216,7 +212,7 @@
 	} else
 		CHECK;
 
-	for(i=0; i<5; i++) {
+	for(i=0; i<MAPSIZE; i++) {
 		_startcall(display); /* install and reset error handlers */
 		buttonpress(display, (unsigned int)i+1);
 		if (geterr() != ((i<nbuttons)?Success:BadValue)) {
@@ -228,7 +224,7 @@
 		relalldev();
 		_endcall(display); /* back to catching unexpected ones */
 	}
-	CHECKPASS(2+5);
+	CHECKPASS(2+MAPSIZE);
 
 >>ASSERTION Good A
 When the