Plan 9 from Bell Labs 2008-01-04

dist/replica/_plan9.db

@@ -9470,7 +9470,7 @@ sys/src/cmd/acme/buff.c - 664 sys sys 1014926092 5573
 sys/src/cmd/acme/cols.c - 664 sys sys 1111119425 11229
 sys/src/cmd/acme/dat.h - 664 sys sys 1111606459 11106
 sys/src/cmd/acme/disk.c - 664 sys sys 1014926093 2151
-sys/src/cmd/acme/ecmd.c - 664 sys sys 1111606460 24205
+sys/src/cmd/acme/ecmd.c - 664 sys sys 1199391526 24298
 sys/src/cmd/acme/edit.c - 664 sys sys 1124993578 12019
 sys/src/cmd/acme/edit.h - 664 sys sys 1124993577 2369
 sys/src/cmd/acme/elog.c - 664 sys sys 1111607796 7294
@@ -15856,3 +15856,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
+386/bin/acme - 775 sys sys 1199420871 431785

dist/replica/plan9.db

@@ -19,7 +19,7 @@
 386/bin/9660srv - 775 sys sys 1168402261 104975
 386/bin/aan - 775 sys sys 1196742429 129831
 386/bin/acid - 775 sys sys 1197665698 405309
-386/bin/acme - 775 sys sys 1197732610 431757
+386/bin/acme - 775 sys sys 1199420871 431785
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1173754547 134719
 386/bin/ape/cc - 775 sys sys 1168402263 70642
@@ -9470,7 +9470,7 @@ sys/src/cmd/acme/buff.c - 664 sys sys 1014926092 5573
 sys/src/cmd/acme/cols.c - 664 sys sys 1111119425 11229
 sys/src/cmd/acme/dat.h - 664 sys sys 1111606459 11106
 sys/src/cmd/acme/disk.c - 664 sys sys 1014926093 2151
-sys/src/cmd/acme/ecmd.c - 664 sys sys 1111606460 24205
+sys/src/cmd/acme/ecmd.c - 664 sys sys 1199391526 24298
 sys/src/cmd/acme/edit.c - 664 sys sys 1124993578 12019
 sys/src/cmd/acme/edit.h - 664 sys sys 1124993577 2369
 sys/src/cmd/acme/elog.c - 664 sys sys 1111607796 7294

dist/replica/plan9.log

@@ -18223,3 +18223,5 @@
 1199302204 0 a rc/bin/usbfat: - 775 sys sys 1199300762 712
 1199305806 0 c sys/src/cmd/fossil/fossil-acid - 664 sys sys 1199304805 4367
 1199307604 0 c 386/bin/aux/vga - 775 sys sys 1199305865 334943
+1199392205 0 c sys/src/cmd/acme/ecmd.c - 664 sys sys 1199391526 24298
+1199421004 0 c 386/bin/acme - 775 sys sys 1199420871 431785

sys/src/cmd/acme/ecmd.c

@@ -413,8 +413,10 @@ move(File *f, Address addr2)
 	}else if(addr.r.q0 >= addr2.r.q1){
 		copy(f, addr2);
 		elogdelete(f, addr.r.q0, addr.r.q1);
+	}else if(addr.r.q0==addr2.r.q0 && addr.r.q1==addr2.r.q1){
+		;	/* move to self; no-op */
 	}else
-		error("move overlaps itself");
+		editerror("move overlaps itself");
 }
 
 int