===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/mode-key.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -c -r1.52 -r1.53
*** src/usr.bin/tmux/Attic/mode-key.c	2013/03/22 15:52:40	1.52
--- src/usr.bin/tmux/Attic/mode-key.c	2013/07/05 14:38:22	1.53
***************
*** 1,4 ****
! /* $OpenBSD: mode-key.c,v 1.52 2013/03/22 15:52:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: mode-key.c,v 1.53 2013/07/05 14:38:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 35,43 ****
   *
   * vi command mode is handled by having a mode flag in the struct which allows
   * two sets of bindings to be swapped between. A couple of editing commands
!  * (MODEKEYEDIT_SWITCHMODE, MODEKEYEDIT_SWITCHMODEAPPEND,
!  * MODEKEYEDIT_SWITCHMODEAPPENDLINE, and MODEKEYEDIT_SWITCHMODEBEGINLINE)
!  * are special-cased to do this.
   */
  
  /* Edit keys command strings. */
--- 35,41 ----
   *
   * vi command mode is handled by having a mode flag in the struct which allows
   * two sets of bindings to be swapped between. A couple of editing commands
!  * (any matching MODEKEYEDIT_SWITCHMODE*) are special-cased to do this.
   */
  
  /* Edit keys command strings. */
***************
*** 67,72 ****
--- 65,73 ----
  	{ MODEKEYEDIT_SWITCHMODEAPPEND, "switch-mode-append" },
  	{ MODEKEYEDIT_SWITCHMODEAPPENDLINE, "switch-mode-append-line" },
  	{ MODEKEYEDIT_SWITCHMODEBEGINLINE, "switch-mode-begin-line" },
+ 	{ MODEKEYEDIT_SWITCHMODECHANGELINE, "switch-mode-change-line" },
+ 	{ MODEKEYEDIT_SWITCHMODESUBSTITUTE, "switch-mode-substitute" },
+ 	{ MODEKEYEDIT_SWITCHMODESUBSTITUTELINE, "switch-mode-substitute-line" },
  	{ MODEKEYEDIT_TRANSPOSECHARS, "transpose-chars" },
  
  	{ 0, NULL }
***************
*** 166,174 ****
--- 167,177 ----
  	{ '0',			    1, MODEKEYEDIT_STARTOFLINE },
  	{ 'A',			    1, MODEKEYEDIT_SWITCHMODEAPPENDLINE },
  	{ 'B',			    1, MODEKEYEDIT_PREVIOUSSPACE },
+ 	{ 'C',			    1, MODEKEYEDIT_SWITCHMODECHANGELINE },
  	{ 'D',			    1, MODEKEYEDIT_DELETETOENDOFLINE },
  	{ 'E',			    1, MODEKEYEDIT_NEXTSPACEEND },
  	{ 'I',			    1, MODEKEYEDIT_SWITCHMODEBEGINLINE },
+ 	{ 'S',			    1, MODEKEYEDIT_SWITCHMODESUBSTITUTELINE },
  	{ 'W',			    1, MODEKEYEDIT_NEXTSPACE },
  	{ 'X',			    1, MODEKEYEDIT_BACKSPACE },
  	{ '\003' /* C-c */,	    1, MODEKEYEDIT_CANCEL },
***************
*** 185,190 ****
--- 188,194 ----
  	{ 'k',			    1, MODEKEYEDIT_HISTORYUP },
  	{ 'l',			    1, MODEKEYEDIT_CURSORRIGHT },
  	{ 'p',			    1, MODEKEYEDIT_PASTE },
+ 	{ 's',			    1, MODEKEYEDIT_SWITCHMODESUBSTITUTE },
  	{ 'w',			    1, MODEKEYEDIT_NEXTWORD },
  	{ 'x',			    1, MODEKEYEDIT_DELETE },
  	{ KEYC_BSPACE,		    1, MODEKEYEDIT_BACKSPACE },
***************
*** 545,550 ****
--- 549,557 ----
  	case MODEKEYEDIT_SWITCHMODEAPPEND:
  	case MODEKEYEDIT_SWITCHMODEAPPENDLINE:
  	case MODEKEYEDIT_SWITCHMODEBEGINLINE:
+ 	case MODEKEYEDIT_SWITCHMODECHANGELINE:
+ 	case MODEKEYEDIT_SWITCHMODESUBSTITUTE:
+ 	case MODEKEYEDIT_SWITCHMODESUBSTITUTELINE:
  		mdata->mode = 1 - mdata->mode;
  		/* FALLTHROUGH */
  	default: