From 85620a8011570830a70e5c3b9394ea740655da33 Mon Sep 17 00:00:00 2001
From: "Charles.Forsyth" <devnull@localhost>
Date: Wed, 9 Jan 2008 22:46:18 +0000
Subject: 20080109

---
 appl/acme/ecmd.b   |   4 +++-
 appl/cmd/cddb.b    |   1 +
 dis/acme/ecmd.dis  | Bin 15427 -> 15443 bytes
 dis/cddb.dis       | Bin 4483 -> 4483 bytes
 emu/port/sysfile.c |   2 +-
 include/version.h  |   2 +-
 man/2/wait         |   4 ++--
 os/port/sysfile.c  |   2 +-
 8 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/appl/acme/ecmd.b b/appl/acme/ecmd.b
index b85b5bb1..c31643f1 100644
--- a/appl/acme/ecmd.b
+++ b/appl/acme/ecmd.b
@@ -448,8 +448,10 @@ move(f: ref File, addr2: Address)
 	}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");
 }
 
 m_cmd(t: ref Text, cp: ref Cmd): int
diff --git a/appl/cmd/cddb.b b/appl/cmd/cddb.b
index 6265ba24..5d88725b 100644
--- a/appl/cmd/cddb.b
+++ b/appl/cmd/cddb.b
@@ -112,6 +112,7 @@ cddbfilltoc(t: ref Toc): int
 			return died(p);
 		categ = hd tl fl;
 		id = hd tl tl fl;
+	210 or	# exact matches
 	211 =>	# close matches
 		if((p = getline(bin)) == nil)
 			return died(nil);
diff --git a/dis/acme/ecmd.dis b/dis/acme/ecmd.dis
index ceeef6ea..1285f17f 100644
Binary files a/dis/acme/ecmd.dis and b/dis/acme/ecmd.dis differ
diff --git a/dis/cddb.dis b/dis/cddb.dis
index 7227eebb..91cb1085 100644
Binary files a/dis/cddb.dis and b/dis/cddb.dis differ
diff --git a/emu/port/sysfile.c b/emu/port/sysfile.c
index db7a06eb..8159ae2d 100644
--- a/emu/port/sysfile.c
+++ b/emu/port/sysfile.c
@@ -1077,7 +1077,7 @@ kiounit(int fd)
 	Chan *c;
 	int n;
 
-	c = fdtochan(up->env->fgrp, fd, ORDWR, 0, 1);
+	c = fdtochan(up->env->fgrp, fd, -1, 0, 1);
 	if(waserror()){
 		cclose(c);
 		return 0;	/* n.b. */
diff --git a/include/version.h b/include/version.h
index a82ea214..60a285ba 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20071227)"
+#define VERSION	"Fourth Edition (20080109)"
diff --git a/man/2/wait b/man/2/wait
index a7cf56f0..9854e3ec 100644
--- a/man/2/wait
+++ b/man/2/wait
@@ -64,12 +64,12 @@ file open on
 it allows, for instance,
 a process to use
 .B alt
-to exchange data with a process but also watch for to exit (for good or ill).
+to exchange data with a process but also see it exit (for good or ill).
 It starts a monitor process that applies
 .B read
 to
 .I fd
-and send the resulting tuple on a channel.
+and sends each resulting tuple on a channel.
 It returns a tuple
 .BI ( pid\f5,\fP\ c )
 where
diff --git a/os/port/sysfile.c b/os/port/sysfile.c
index 1ff0fe5f..702470b6 100644
--- a/os/port/sysfile.c
+++ b/os/port/sysfile.c
@@ -1113,7 +1113,7 @@ kiounit(int fd)
 	Chan *c;
 	int n;
 
-	c = fdtochan(up->env->fgrp, fd, ORDWR, 0, 1);
+	c = fdtochan(up->env->fgrp, fd, -1, 0, 1);
 	if(waserror()){
 		cclose(c);
 		return 0;	/* n.b. */
-- 
cgit v1.2.3