[9front] three small changes in acme from plan9port

[9front] three small changes in acme from plan9port

[Xiao-Yong Jin]

origin:

https://github.com/9fans/plan9port/pull/493
https://github.com/9fans/plan9port/pull/489
https://github.com/9fans/plan9port/pull/461

hg diff follows:

diff -r 303fbe43c06d sys/src/cmd/acme/cols.c
--- a/sys/src/cmd/acme/cols.c	Fri Apr 09 03:18:53 2021 +0200
+++ b/sys/src/cmd/acme/cols.c	Thu Apr 08 23:50:06 2021 -0500
@@ -208,8 +208,8 @@
 			r1.max.y = r.max.y;
 		else {
 			r1.max.y = r1.min.y;
-			if(new > 0 && old > 0 && Dy(w->r) > Border+font->height)
-				r1.max.y += (Dy(w->r)-Border-font->height)*new/old + Border + font->height;
+			if(new > 0 && old > 0 && Dy(w->r) > font->height)
+				r1.max.y += (Dy(w->r)-font->height)*new/old + Border + font->height;
 		}
 		r2 = r1;
 		r2.max.y = r2.min.y+Border;
@@ -422,7 +422,7 @@
 		}
 		if(j < c->nw-1){	/* no border on last window */
 			r.min.y = v->r.max.y;
-			r.max.y += Border;
+			r.max.y = r.min.y + Border;
 			draw(screen, r, display->black, nil, ZP);
 		}
 		y1 = r.max.y;
diff -r 303fbe43c06d sys/src/cmd/acme/text.c
--- a/sys/src/cmd/acme/text.c	Fri Apr 09 03:18:53 2021 +0200
+++ b/sys/src/cmd/acme/text.c	Thu Apr 08 23:50:06 2021 -0500
@@ -664,6 +664,7 @@
 	uint q0, q1;
 	int nnb, nb, n, i;
 	int nr;
+	Rune rr;
 	Rune *rp;
 	Text *u;
 
@@ -818,10 +819,10 @@
 			nr = 0;
 			rp[nr++] = r;
 			for(i=0; i<nnb; i++){
-				r = textreadc(t, t->q0-nnb+i);
-				if(r != ' ' && r != '\t')
+				rr = textreadc(t, t->q0-nnb+i);
+				if(rr != ' ' && rr != '\t')
 					break;
-				rp[nr++] = r;
+				rp[nr++] = rr;
 			}
 		}
 		break; /* fall through to normal code */

Re: [9front] three small changes in acme from plan9port

[ori]

Quoth Xiao-Yong Jin <meta.jxy@gmail.com>:
> origin:
> 
> https://github.com/9fans/plan9port/pull/493
> https://github.com/9fans/plan9port/pull/489
> https://github.com/9fans/plan9port/pull/461
> 


Looks good, committed.