plan9port

commit e58459c7b3150fe23f3a520f3e9a758a51685047
parent 297cded760c755079e9f22d22fa37b864bf88a51
Author: rsc <devnull@localhost>
Date:   Thu, 29 Dec 2005 21:15:06 +0000

fix paste in raw hold mode

Diffstat:
M
src/cmd/9term/9term.c
 | 
4
++--
M
src/cmd/9term/wind.c
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/cmd/9term/9term.c b/src/cmd/9term/9term.c
@@ -596,7 +596,7 @@ listenproc(void *arg)
 			close(afd);
 			return;
 		}
-		proccreate(textproc, (void*)fd, STACK);
+		proccreate(textproc, (void*)(uintptr)fd, STACK);
 	}
 }
 
@@ -608,7 +608,7 @@ textproc(void *arg)
 	char buf[4096], *p, *ep;
 
 	threadsetname("textproc");
-	fd = (int)arg;
+	fd = (uintptr)arg;
 	p = buf;
 	ep = buf+sizeof buf;
 	if(w == nil){
diff --git a/src/cmd/9term/wind.c b/src/cmd/9term/wind.c
@@ -803,7 +803,7 @@ wpaste(Window *w)
 		return;
 	wcut(w);
 	q0 = w->q0;
-	if(w->rawing && q0==w->nr){
+	if(w->rawing && !w->holding && q0==w->nr){
 		waddraw(w, snarf, nsnarf);
 		wsetselect(w, q0, q0);
 	}else{