20071011-1132

7 files changed, 30 insertions, 24 deletions

diff --git a/CHANGES b/CHANGES
index d1af15c9..98090cb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+20071011
+	remove obsolete references to sh-exception(2)
+20071010
+	add abhey's changes for cmd key as unicode compose key for MacOS X to emu/MacOSX/win.c
 20071008
 	nemo's change to emu/port/random.c; really the file needs a little rewriting for clarity (too many overlapping states)
 20071002
diff --git a/emu/MacOSX/win.c b/emu/MacOSX/win.c
index c6db1429..41ca8d9d 100644
--- a/emu/MacOSX/win.c
+++ b/emu/MacOSX/win.c
@@ -390,7 +390,8 @@ MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *us
 					mousebuttons |= 4;	/* set button 3 */
 					button3 = true;
 					sendbuttons(mousebuttons, mouseX, mouseY);
-				}
+				}else
+					gkbdputc(gkbdq, Latin);
 				break;
 			case 0:
 			default:
@@ -416,9 +417,11 @@ MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef event, void *us
 		case kEventRawKeyDown:
 		case kEventRawKeyRepeat:
 			if(macKeyModifiers != cmdKey) {
-				int key = convert_key(macKeyCode, macCharCodes);
-				if (key != -1) gkbdputc(gkbdq, key);
-			} else
+				int key;
+				key = convert_key(macKeyCode, macCharCodes);
+				if(key != -1)
+					gkbdputc(gkbdq, key);
+			}else
 				result = eventNotHandledErr;
 			break;
 		default:
diff --git a/include/version.h b/include/version.h
index 6f7dd145..355cdd06 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION	"Fourth Edition (20071008)"
+#define VERSION	"Fourth Edition (20071011)"
diff --git a/man/1/0intro b/man/1/0intro
index 0689e614..4d7335a1 100644
--- a/man/1/0intro
+++ b/man/1/0intro
@@ -164,18 +164,18 @@ Volume 2 contains papers and other documentation about Inferno.
 .PP
 The back of this volume contains a permuted index.
 .SH DIAGNOSTICS
+On successful execution, a process can simply exit.
 Programs (modules) that wish to return error status to
 the command interpreters
 .IR sh (1)
 and
 .IR mash (1)
-do so by executing a
-.IR sys-raise
-(see
-.IR sys-exception (2))
-with an error string starting with
+do so by raising a special exception (eg, using the
+.B raise
+statement in Limbo).
+The exception's value is a string
+beginning with the text
 .RB ` fail: '.
-On successful execution, a process can simply exit.
 .SH SEE ALSO
 .IR intro (2),
 .IR intro (3),
diff --git a/man/1/sh-std b/man/1/sh-std
index b3367c7f..bfaa0873 100644
--- a/man/1/sh-std
+++ b/man/1/sh-std
@@ -334,8 +334,9 @@ raises the exception
 will be truncated if it is longer than
 that allowed by
 .I raise
-(see
-.IR sys-exception (2)).
+(128 bytes in
+.IR utf (6)
+representation).
 Control will be transferred to the innermost
 rescue block in the same process that
 matches
@@ -365,13 +366,13 @@ matching
 where
 .I pattern
 is of the same form accepted by
-.I rescue
-(see
-.IR sys-exception (2));
-i.e. an exact match, or a prefix
-followed by an asterisk
-.RB ( * )
-which will match an exception starting with the prefix.
+Limbo's
+.B exception
+handling statement.
+Specifically, the pattern is a string that matches literally,
+except that a trailing
+.RB ` * '
+character will match any sequence of characters.
 If an exception is caught,
 .B rescue
 executes
diff --git a/man/2/command b/man/2/command
index d46f9525..58d773b0 100644
--- a/man/2/command
+++ b/man/2/command
@@ -128,5 +128,4 @@ because the parent is blocked on the receive.
 .IR sh (1),
 .IR wm (1),
 .IR sh (2),
-.IR sys-pctl (2),
-.IR sys-exception (2)
+.IR sys-pctl (2)
diff --git a/man/2/sh b/man/2/sh
index ebe82f15..74b2dbc7 100644
--- a/man/2/sh
+++ b/man/2/sh
@@ -557,5 +557,4 @@ The file used by the shell to wait for dead child processes.
 .IR sh (1),
 .IR sh-std (1),
 .IR sh-expr (1),
-.IR sh-tk (1),
-.IR sys-exception (2)
+.IR sh-tk (1)