commit - c91bd3283a44946fd420ce68c43580aa0d327546
commit + 4da83e7ccebd8ab6eb33747d16292567ec59d7dd
blob - /dev/null
blob + b2ac97190f873ce8c8fbdb8f747d4500b53f694f (mode 644)
--- /dev/null
+++ plumb/initial.plumbing
@@ -0,0 +1,5 @@
+# to update: cat $HOME/lib/plumbing | 9p write plumb/rules
+
+editor = acme
+include basic
+
blob - 87924caa47211b1bf3d0b435d1b90dfe661ce4aa
blob + fbfb9f14fdc59adc724d81f01441547013723fba
--- src/cmd/acme/acme.c
+++ src/cmd/acme/acme.c
@@ -45,7 +45,7 @@ Command *command;
 
 void	acmeerrorinit(void);
 void	readfile(Column*, char*);
-int	shutdown(void*, char*);
+static int	shutdown(void*, char*);
 
 void
 derror(Display *d, char *errorstr)
@@ -270,7 +270,7 @@ char *oknotes[] ={
 
 int	dumping;
 
-int
+static int
 shutdown(void *v, char *msg)
 {
 	int i;
blob - 14a715b3185faf909f5cd51ade0c68cdadd328f7
blob + 6ad3058ee09f622a0947a5555f2db61fb6685bbb
--- src/cmd/acme/cols.c
+++ src/cmd/acme/cols.c
@@ -472,7 +472,7 @@ coldragwin(Column *c, Window *w, int but)
 	}
 	/* is it a flick to the right? */
 	if(abs(p.y-op.y)<10 && p.x>op.x+30 && rowwhichcol(c->row, p)==c)
-		p.x += Dx(w->r);	/* yes: toss to next column */
+		p.x = op.x+Dx(w->r);	/* yes: toss to next column */
 	nc = rowwhichcol(c->row, p);
 	if(nc!=nil && nc!=c){
 		colclose(c, w, FALSE);
blob - 191ecfe371c30b5af6908522116331d6f697fd64
blob + bd13a773dd7630930a42ead89d256a6f69f24008
--- src/cmd/mkfile
+++ src/cmd/mkfile
@@ -12,3 +12,4 @@ DIRS=`ls -l |sed -n 's/^d.* //p' |egrep -v "$BUGGERED"
 
 <$PLAN9/src/mkdirs
 
+dir-install: $PLAN9/bin/yacc
blob - a10f2c37afa9ed2546d51eacd974e214913660f8
blob + d693ed58442318bc5d33c3f588126471e326c6c5
--- src/cmd/plumb/plumb.c
+++ src/cmd/plumb/plumb.c
@@ -9,7 +9,7 @@ Plumbmsg m;
 void
 usage(void)
 {
-	fprint(2, "usage:  plumb [-p plumbfile] [-a 'attr=value ...'] [-s src] [-d dst] [-t type] [-w wdir] -i | data1\n");
+	fprint(2, "usage: plumb [-p plumbfile] [-a 'attr=value ...'] [-s src] [-d dst] [-t type] [-w wdir] -i | data1\n");
 	exits("usage");
 }
 
blob - 957a352ba57879c7f9b696becb13a9e405261bc3
blob + d0fff4a652c93f810f77199c9237bbbe8a422336
--- src/libthread/channel.c
+++ src/libthread/channel.c
@@ -201,7 +201,6 @@ _threadnalt++;
 	}else{
 		altexec(a, s);	/* unlocks chanlock, does splx */
 	}
-	_sched();
 	t->chan = Channone;
 _threadnalt++;
 	return a - alts;
blob - e8e3129c04dd4a376773b5543476738458313e3f
blob + 5dd7e86868941e332f09c0e9ab4ee286f8c71552
--- src/libthread/fdwait.c
+++ src/libthread/fdwait.c
@@ -146,10 +146,11 @@ pollidle(void *v)
 		for(i=0; i<npoll; i++)
 			if(pfd[i].fd != -1 && pfd[i].revents){
 				//fprint(2, " %d", pfd[i].fd);
-				nbsendul(polls[i].c, 1);
 				pfd[i].fd = -1;
 				pfd[i].events = 0;
 				pfd[i].revents = 0;
+				nbsendul(polls[i].c, 1);
+				//fprint(2, " x%d", pfd[i].fd);
 			}
 		//fprint(2, "\n");
 	}
@@ -192,7 +193,7 @@ _threadfdwait(int fd, int rw, ulong pc)
 	pfd[i].fd = fd;
 	pfd[i].events = rw=='r' ? POLLIN : POLLOUT;
 	polls[i].c = &s.c;
-	//fprint(2, "%s [%3d] fdwait %d %c list *0x%lux\n",
+	if(0) fprint(2, "%s [%3d] fdwait %d %c list *0x%lux\n",
 		argv0, threadid(), fd, rw, pc);
 	recvul(&s.c);
 }