===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/mode-key.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- src/usr.bin/tmux/Attic/mode-key.c	2012/08/11 06:45:33	1.46
+++ src/usr.bin/tmux/Attic/mode-key.c	2012/08/27 21:29:23	1.47
@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-key.c,v 1.46 2012/08/11 06:45:33 nicm Exp $ */
+/* $OpenBSD: mode-key.c,v 1.47 2012/08/27 21:29:23 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -192,16 +192,16 @@
 
 /* vi choice selection keys. */
 const struct mode_key_entry mode_key_vi_choice[] = {
-	{ '0',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '1',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '2',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '3',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '4',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '5',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '6',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '7',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '8',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '9',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '0' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '1' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '2' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '3' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '4' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '5' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '6' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '7' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '8' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '9' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
 	{ '\002' /* C-b */,     0, MODEKEYCHOICE_PAGEUP },
 	{ '\003' /* C-c */,	0, MODEKEYCHOICE_CANCEL },
 	{ '\005' /* C-e */,     0, MODEKEYCHOICE_SCROLLDOWN },
@@ -330,16 +330,16 @@
 
 /* emacs choice selection keys. */
 const struct mode_key_entry mode_key_emacs_choice[] = {
-	{ '0',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '1',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '2',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '3',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '4',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '5',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '6',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '7',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '8',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
-	{ '9',			0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '0' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '1' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '2' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '3' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '4' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '5' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '6' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '7' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '8' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
+	{ '9' | KEYC_ESCAPE,	0, MODEKEYCHOICE_STARTNUMBERPREFIX },
 	{ '\003' /* C-c */,	0, MODEKEYCHOICE_CANCEL },
 	{ '\016' /* C-n */,	0, MODEKEYCHOICE_DOWN },
 	{ '\020' /* C-p */,	0, MODEKEYCHOICE_UP },