===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/key-string.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- src/usr.bin/tmux/key-string.c	2009/07/26 21:42:08	1.5
+++ src/usr.bin/tmux/key-string.c	2009/07/28 09:18:01	1.6
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-string.c,v 1.5 2009/07/26 21:42:08 nicm Exp $ */
+/* $OpenBSD: key-string.c,v 1.6 2009/07/28 09:18:01 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -58,6 +58,8 @@
 	{ "Tab",	'\011' },
 	{ "BTab",	KEYC_BTAB },
 	{ "BSpace",	KEYC_BSPACE },
+	{ "Enter",	'\r' },
+	{ "Escape",	'\033' },
 
 	/* Arrow keys. */
 	{ "Up",		KEYC_UP },
@@ -177,6 +179,11 @@
 		return (tmp2);
 	}
 
+	for (i = 0; i < nitems(key_string_table); i++) {
+		if (key == key_string_table[i].key)
+			return (key_string_table[i].string);
+	}
+
 	if (key >= 32 && key <= 255) {
 		tmp[0] = key;
 		tmp[1] = '\0';
@@ -191,9 +198,5 @@
 		return (tmp);
 	}
 
-	for (i = 0; i < nitems(key_string_table); i++) {
-		if (key == key_string_table[i].key)
-			return (key_string_table[i].string);
-	}
 	return (NULL);
 }