===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/key-bindings.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/key-bindings.c	2009/11/13 07:00:54	1.13
--- src/usr.bin/tmux/key-bindings.c	2009/11/18 13:16:33	1.14
***************
*** 1,4 ****
! /* $OpenBSD: key-bindings.c,v 1.13 2009/11/13 07:00:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: key-bindings.c,v 1.14 2009/11/18 13:16:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 105,112 ****
  		{ ' ',			  0, &cmd_next_layout_entry },
  		{ '!', 			  0, &cmd_break_pane_entry },
  		{ '"', 			  0, &cmd_split_window_entry },	
- 		{ '%', 			  0, &cmd_split_window_entry },	
  		{ '#', 			  0, &cmd_list_buffers_entry },
  		{ '&', 			  0, &cmd_confirm_before_entry },
  		{ ',', 			  0, &cmd_command_prompt_entry },
  		{ '-', 			  0, &cmd_delete_buffer_entry },
--- 105,112 ----
  		{ ' ',			  0, &cmd_next_layout_entry },
  		{ '!', 			  0, &cmd_break_pane_entry },
  		{ '"', 			  0, &cmd_split_window_entry },	
  		{ '#', 			  0, &cmd_list_buffers_entry },
+ 		{ '%', 			  0, &cmd_split_window_entry },	
  		{ '&', 			  0, &cmd_confirm_before_entry },
  		{ ',', 			  0, &cmd_command_prompt_entry },
  		{ '-', 			  0, &cmd_delete_buffer_entry },
***************
*** 123,135 ****
  		{ '9', 			  0, &cmd_select_window_entry },
  		{ ':', 			  0, &cmd_command_prompt_entry },
  		{ '?', 			  0, &cmd_list_keys_entry },
  		{ '[', 			  0, &cmd_copy_mode_entry },
  		{ '\'',			  0, &cmd_select_prompt_entry },
  		{ '\032', /* C-z */	  0, &cmd_suspend_client_entry },
  		{ ']', 			  0, &cmd_paste_buffer_entry },
  		{ 'c', 			  0, &cmd_new_window_entry },
  		{ 'd', 			  0, &cmd_detach_client_entry },
- 		{ 'D',			  0, &cmd_choose_client_entry },
  		{ 'f', 			  0, &cmd_command_prompt_entry },
  		{ 'i',			  0, &cmd_display_message_entry },
  		{ 'l', 			  0, &cmd_last_window_entry },
--- 123,137 ----
  		{ '9', 			  0, &cmd_select_window_entry },
  		{ ':', 			  0, &cmd_command_prompt_entry },
  		{ '?', 			  0, &cmd_list_keys_entry },
+ 		{ 'D',			  0, &cmd_choose_client_entry },
  		{ '[', 			  0, &cmd_copy_mode_entry },
  		{ '\'',			  0, &cmd_select_prompt_entry },
+ 		{ '\002', /* C-b */	  0, &cmd_send_prefix_entry },
+ 		{ '\017', /* C-o */	  0, &cmd_rotate_window_entry },
  		{ '\032', /* C-z */	  0, &cmd_suspend_client_entry },
  		{ ']', 			  0, &cmd_paste_buffer_entry },
  		{ 'c', 			  0, &cmd_new_window_entry },
  		{ 'd', 			  0, &cmd_detach_client_entry },
  		{ 'f', 			  0, &cmd_command_prompt_entry },
  		{ 'i',			  0, &cmd_display_message_entry },
  		{ 'l', 			  0, &cmd_last_window_entry },
***************
*** 144,156 ****
  		{ 'x', 			  0, &cmd_confirm_before_entry },
  		{ '{',			  0, &cmd_swap_pane_entry },
  		{ '}',			  0, &cmd_swap_pane_entry },
! 		{ '\002', /* C-b */	  0, &cmd_send_prefix_entry },
  		{ '1' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ '2' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ '3' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ '4' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ KEYC_PPAGE, 		  0, &cmd_copy_mode_entry },
  		{ 'n' | KEYC_ESCAPE, 	  0, &cmd_next_window_entry },
  		{ 'p' | KEYC_ESCAPE, 	  0, &cmd_previous_window_entry },
  		{ KEYC_UP, 		  0, &cmd_up_pane_entry },
  		{ KEYC_DOWN, 		  0, &cmd_down_pane_entry },
--- 146,159 ----
  		{ 'x', 			  0, &cmd_confirm_before_entry },
  		{ '{',			  0, &cmd_swap_pane_entry },
  		{ '}',			  0, &cmd_swap_pane_entry },
! 		{ '~',			  0, &cmd_show_messages_entry },
  		{ '1' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ '2' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ '3' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ '4' | KEYC_ESCAPE,	  0, &cmd_select_layout_entry },
  		{ KEYC_PPAGE, 		  0, &cmd_copy_mode_entry },
  		{ 'n' | KEYC_ESCAPE, 	  0, &cmd_next_window_entry },
+ 		{ 'o' | KEYC_ESCAPE,	  0, &cmd_rotate_window_entry },
  		{ 'p' | KEYC_ESCAPE, 	  0, &cmd_previous_window_entry },
  		{ KEYC_UP, 		  0, &cmd_up_pane_entry },
  		{ KEYC_DOWN, 		  0, &cmd_down_pane_entry },
***************
*** 162,169 ****
  		{ KEYC_DOWN | KEYC_CTRL,  1, &cmd_resize_pane_entry },	
  		{ KEYC_LEFT | KEYC_CTRL,  1, &cmd_resize_pane_entry },
  		{ KEYC_RIGHT | KEYC_CTRL, 1, &cmd_resize_pane_entry },
- 		{ 'o' | KEYC_ESCAPE,	  0, &cmd_rotate_window_entry },
- 		{ '\017', /* C-o */	  0, &cmd_rotate_window_entry },
  	};
  	u_int		 i;
  	struct cmd	*cmd;
--- 165,170 ----