git: 9front

Info  •  Files  •  Log  •  Branches

merge

--- a/sys/src/cmd/paint.c

+++ b/sys/src/cmd/paint.c

@@ -259,10 +259,16 @@

 		if((tmp = undo[x]) == nil)

 			return;

 		undo[x] = nil;

-		expand(tmp->r);

-		draw(canvas, tmp->r, tmp, nil, tmp->r.min);

-		update(&tmp->r);

-		freeimage(tmp);

+		if(canvas != nil && canvas->chan != tmp->chan){

+			freeimage(canvas);

+			canvas = tmp;

+			update(nil);

+		} else {

+			expand(tmp->r);

+			draw(canvas, tmp->r, tmp, nil, tmp->r.min);

+			update(&tmp->r);

+			freeimage(tmp);

+		}

 	}

 }

--- a/sys/src/cmd/samterm/main.c

+++ b/sys/src/cmd/samterm/main.c

@@ -310,6 +310,9 @@

 {

 	Text *t=(Text *)l->user1;

+	if(t->tag == Untagged)

+		return;

+

 	switch(but){

 	case 1:

 		outTsll(Torigin, t->tag, l->origin, p0);

-- 

⑨