===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/cmdbuf.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/less/cmdbuf.c	2015/11/09 14:25:32	1.12
+++ src/usr.bin/less/cmdbuf.c	2015/11/23 09:42:57	1.13
@@ -170,11 +170,11 @@
 	if (len == 1) {
 		pr = prchar((int)ch);
 		if (pwidth != NULL || bswidth != NULL) {
-			int len = strlen(pr);
+			int prlen = strlen(pr);
 			if (pwidth != NULL)
-				*pwidth = len;
+				*pwidth = prlen;
 			if (bswidth != NULL)
-				*bswidth = len;
+				*bswidth = prlen;
 		}
 	} else {
 		pr = prutfchar(ch);
@@ -185,11 +185,11 @@
 				if (bswidth != NULL)
 					*bswidth = 0;
 			} else if (is_ubin_char(ch)) {
-				int len = strlen(pr);
+				int prlen = strlen(pr);
 				if (pwidth != NULL)
-					*pwidth = len;
+					*pwidth = prlen;
 				if (bswidth != NULL)
-					*bswidth = len;
+					*bswidth = prlen;
 			} else {
 				LWCHAR prev_ch = step_char(&p, -1, cmdbuf);
 				if (is_combining_char(prev_ch, ch)) {