===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/mode-key.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/tmux/Attic/mode-key.c	2013/10/23 11:31:03	1.55
--- src/usr.bin/tmux/Attic/mode-key.c	2014/02/14 12:35:58	1.56
***************
*** 1,4 ****
! /* $OpenBSD: mode-key.c,v 1.55 2013/10/23 11:31:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: mode-key.c,v 1.56 2014/02/14 12:35:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 153,158 ****
--- 153,159 ----
  	{ '\025' /* C-u */,	    0, MODEKEYEDIT_DELETELINE },
  	{ '\027' /* C-w */,	    0, MODEKEYEDIT_DELETEWORD },
  	{ '\033' /* Escape */,	    0, MODEKEYEDIT_SWITCHMODE },
+ 	{ '\n',			    0, MODEKEYEDIT_ENTER },
  	{ '\r',			    0, MODEKEYEDIT_ENTER },
  	{ KEYC_BSPACE,		    0, MODEKEYEDIT_BACKSPACE },
  	{ KEYC_DC,		    0, MODEKEYEDIT_DELETE },
***************
*** 176,181 ****
--- 177,183 ----
  	{ 'X',			    1, MODEKEYEDIT_BACKSPACE },
  	{ '\003' /* C-c */,	    1, MODEKEYEDIT_CANCEL },
  	{ '\010' /* C-h */,	    1, MODEKEYEDIT_BACKSPACE },
+ 	{ '\n',			    1, MODEKEYEDIT_ENTER },
  	{ '\r',			    1, MODEKEYEDIT_ENTER },
  	{ '^',			    1, MODEKEYEDIT_STARTOFLINE },
  	{ 'a',			    1, MODEKEYEDIT_SWITCHMODEAPPEND },
***************
*** 219,224 ****
--- 221,227 ----
  	{ '\005' /* C-e */,	    0, MODEKEYCHOICE_SCROLLDOWN },
  	{ '\006' /* C-f */,	    0, MODEKEYCHOICE_PAGEDOWN },
  	{ '\031' /* C-y */,	    0, MODEKEYCHOICE_SCROLLUP },
+ 	{ '\n',			    0, MODEKEYCHOICE_CHOOSE },
  	{ '\r',			    0, MODEKEYCHOICE_CHOOSE },
  	{ 'j',			    0, MODEKEYCHOICE_DOWN },
  	{ 'k',			    0, MODEKEYCHOICE_UP },
***************
*** 281,286 ****
--- 284,290 ----
  	{ '\025' /* C-u */,	    0, MODEKEYCOPY_HALFPAGEUP },
  	{ '\031' /* C-y */,	    0, MODEKEYCOPY_SCROLLUP },
  	{ '\033' /* Escape */,	    0, MODEKEYCOPY_CLEARSELECTION },
+ 	{ '\n',			    0, MODEKEYCOPY_COPYSELECTION },
  	{ '\r',			    0, MODEKEYCOPY_COPYSELECTION },
  	{ '^',			    0, MODEKEYCOPY_BACKTOINDENTATION },
  	{ 'b',			    0, MODEKEYCOPY_PREVIOUSWORD },
***************
*** 329,334 ****
--- 333,339 ----
  	{ '\027' /* C-w */,	    0, MODEKEYEDIT_DELETEWORD },
  	{ '\031' /* C-y */,	    0, MODEKEYEDIT_PASTE },
  	{ '\033' /* Escape */,	    0, MODEKEYEDIT_CANCEL },
+ 	{ '\n',			    0, MODEKEYEDIT_ENTER },
  	{ '\r',			    0, MODEKEYEDIT_ENTER },
  	{ 'b' | KEYC_ESCAPE,	    0, MODEKEYEDIT_PREVIOUSWORD },
  	{ 'f' | KEYC_ESCAPE,	    0, MODEKEYEDIT_NEXTWORDEND },
***************
*** 363,368 ****
--- 368,374 ----
  	{ '\020' /* C-p */,	    0, MODEKEYCHOICE_UP },
  	{ '\026' /* C-v */,	    0, MODEKEYCHOICE_PAGEDOWN },
  	{ '\033' /* Escape */,	    0, MODEKEYCHOICE_CANCEL },
+ 	{ '\n',			    0, MODEKEYCHOICE_CHOOSE },
  	{ '\r',			    0, MODEKEYCHOICE_CHOOSE },
  	{ 'q',			    0, MODEKEYCHOICE_CANCEL },
  	{ 'v' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_PAGEUP },