===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/mode-key.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- src/usr.bin/tmux/Attic/mode-key.c	2011/08/16 09:47:18	1.39
+++ src/usr.bin/tmux/Attic/mode-key.c	2011/11/15 23:34:12	1.40
@@ -1,4 +1,4 @@
-/* $OpenBSD: mode-key.c,v 1.39 2011/08/16 09:47:18 nicm Exp $ */
+/* $OpenBSD: mode-key.c,v 1.40 2011/11/15 23:34:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,11 +49,15 @@
 	{ MODEKEYEDIT_DELETE, "delete" },
 	{ MODEKEYEDIT_DELETELINE, "delete-line" },
 	{ MODEKEYEDIT_DELETETOENDOFLINE, "delete-end-of-line" },
+	{ MODEKEYEDIT_DELETEWORD, "delete-word" },
 	{ MODEKEYEDIT_ENDOFLINE, "end-of-line" },
 	{ MODEKEYEDIT_ENTER, "enter" },
 	{ MODEKEYEDIT_HISTORYDOWN, "history-down" },
 	{ MODEKEYEDIT_HISTORYUP, "history-up" },
+	{ MODEKEYEDIT_NEXTWORD, "next-word" },
+	{ MODEKEYEDIT_NEXTWORDEND, "next-word-end" },
 	{ MODEKEYEDIT_PASTE, "paste" },
+	{ MODEKEYEDIT_PREVIOUSWORD, "previous-word" },
 	{ MODEKEYEDIT_STARTOFLINE, "start-of-line" },
 	{ MODEKEYEDIT_SWITCHMODE, "switch-mode" },
 	{ MODEKEYEDIT_SWITCHMODEAPPEND, "switch-mode-append" },
@@ -127,7 +131,8 @@
 	{ '\003' /* C-c */,	0, MODEKEYEDIT_CANCEL },
 	{ '\010' /* C-h */, 	0, MODEKEYEDIT_BACKSPACE },
 	{ '\011' /* Tab */,	0, MODEKEYEDIT_COMPLETE },
-	{ '\025' /* C-u	*/,	0, MODEKEYEDIT_DELETELINE },
+	{ '\025' /* C-u */,	0, MODEKEYEDIT_DELETELINE },
+	{ '\027' /* C-w */,	0, MODEKEYEDIT_DELETEWORD },
 	{ '\033' /* Escape */,	0, MODEKEYEDIT_SWITCHMODE },
 	{ '\r',			0, MODEKEYEDIT_ENTER },
 	{ KEYC_BSPACE,		0, MODEKEYEDIT_BACKSPACE },
@@ -145,13 +150,16 @@
 	{ '\r',			1, MODEKEYEDIT_ENTER },
 	{ '^',			1, MODEKEYEDIT_STARTOFLINE },
 	{ 'a',			1, MODEKEYEDIT_SWITCHMODEAPPEND },
+	{ 'b',			1, MODEKEYEDIT_PREVIOUSWORD },
 	{ 'd',			1, MODEKEYEDIT_DELETELINE },
+	{ 'e',			1, MODEKEYEDIT_NEXTWORDEND },
 	{ 'h',			1, MODEKEYEDIT_CURSORLEFT },
 	{ 'i',			1, MODEKEYEDIT_SWITCHMODE },
 	{ 'j',			1, MODEKEYEDIT_HISTORYDOWN },
 	{ 'k',			1, MODEKEYEDIT_HISTORYUP },
 	{ 'l',			1, MODEKEYEDIT_CURSORRIGHT },
 	{ 'p',			1, MODEKEYEDIT_PASTE },
+	{ 'w',			1, MODEKEYEDIT_NEXTWORD },
 	{ KEYC_BSPACE,		1, MODEKEYEDIT_BACKSPACE },
 	{ KEYC_DC,		1, MODEKEYEDIT_DELETE },
 	{ KEYC_DOWN,		1, MODEKEYEDIT_HISTORYDOWN },
@@ -259,18 +267,21 @@
 	{ '\002' /* C-b */,	0, MODEKEYEDIT_CURSORLEFT },
 	{ '\003' /* C-c */,	0, MODEKEYEDIT_CANCEL },
 	{ '\004' /* C-d */,	0, MODEKEYEDIT_DELETE },
-	{ '\005' /* C-e	*/,	0, MODEKEYEDIT_ENDOFLINE },
+	{ '\005' /* C-e */,	0, MODEKEYEDIT_ENDOFLINE },
 	{ '\006' /* C-f */,	0, MODEKEYEDIT_CURSORRIGHT },
-	{ '\010' /* C-H */, 	0, MODEKEYEDIT_BACKSPACE },
-	{ '\011' /* Tab */,     0, MODEKEYEDIT_COMPLETE },
-	{ '\013' /* C-k	*/,	0, MODEKEYEDIT_DELETETOENDOFLINE },
+	{ '\010' /* C-H */,	0, MODEKEYEDIT_BACKSPACE },
+	{ '\011' /* Tab */,	0, MODEKEYEDIT_COMPLETE },
+	{ '\013' /* C-k */,	0, MODEKEYEDIT_DELETETOENDOFLINE },
 	{ '\016' /* C-n */,	0, MODEKEYEDIT_HISTORYDOWN },
 	{ '\020' /* C-p */,	0, MODEKEYEDIT_HISTORYUP },
 	{ '\024' /* C-t */,	0, MODEKEYEDIT_TRANSPOSECHARS },
-	{ '\025' /* C-u	*/,	0, MODEKEYEDIT_DELETELINE },
+	{ '\025' /* C-u */,	0, MODEKEYEDIT_DELETELINE },
+	{ '\027' /* C-w */,	0, MODEKEYEDIT_DELETEWORD },
 	{ '\031' /* C-y */,	0, MODEKEYEDIT_PASTE },
 	{ '\033' /* Escape */,	0, MODEKEYEDIT_CANCEL },
 	{ '\r',			0, MODEKEYEDIT_ENTER },
+	{ 'b' | KEYC_ESCAPE,	0, MODEKEYEDIT_PREVIOUSWORD },
+	{ 'f' | KEYC_ESCAPE,	0, MODEKEYEDIT_NEXTWORDEND },
 	{ 'm' | KEYC_ESCAPE,	0, MODEKEYEDIT_STARTOFLINE },
 	{ KEYC_BSPACE,		0, MODEKEYEDIT_BACKSPACE },
 	{ KEYC_DC,		0, MODEKEYEDIT_DELETE },