From 78439d25f8b2f6f2289e9f4e4400e0f7cdb5fa70 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Fri, 12 Jan 2007 15:57:34 +0000
Subject: Fix 15-year-old sam protocol bug.

---
 src/cmd/sam/file.c | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'src/cmd/sam/file.c')

diff --git a/src/cmd/sam/file.c b/src/cmd/sam/file.c
index 875a26c7..c0771e05 100644
--- a/src/cmd/sam/file.c
+++ b/src/cmd/sam/file.c
@@ -265,18 +265,6 @@ filedeltext(File *f, Text *t)
 }
 #endif
 
-void
-fileinsert(File *f, uint p0, Rune *s, uint ns)
-{
-	if(p0 > f->b.nc)
-		panic("internal error: fileinsert");
-	if(f->seq > 0)
-		fileuninsert(f, &f->delta, p0, ns);
-	bufinsert(&f->b, p0, s, ns);
-	if(ns)
-		f->mod = TRUE;
-}
-
 void
 fileuninsert(File *f, Buffer *delta, uint p0, uint ns)
 {
@@ -291,18 +279,6 @@ fileuninsert(File *f, Buffer *delta, uint p0, uint ns)
 	bufinsert(delta, delta->nc, (Rune*)&u, Undosize);
 }
 
-void
-filedelete(File *f, uint p0, uint p1)
-{
-	if(!(p0<=p1 && p0<=f->b.nc && p1<=f->b.nc))
-		panic("internal error: filedelete");
-	if(f->seq > 0)
-		fileundelete(f, &f->delta, p0, p1);
-	bufdelete(&f->b, p0, p1);
-	if(p1 > p0)
-		f->mod = TRUE;
-}
-
 void
 fileundelete(File *f, Buffer *delta, uint p0, uint p1)
 {
@@ -499,6 +475,9 @@ fileundo(File *f, int isundo, int canredo, uint *q0p, uint *q1p, int flag)
 
 	raspstart(f);
 	while(delta->nc > 0){
+		/* rasp and buffer are in sync; sync with wire if needed */
+		if(needoutflush())
+			raspflush(f);
 		up = delta->nc-Undosize;
 		bufread(delta, up, (Rune*)&u, Undosize);
 		if(isundo){
-- 
cgit v1.2.3